From patchwork Fri Jan 1 01:17:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 1421643 X-Patchwork-Delegate: hauke@hauke-m.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=hauke-m.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=ODOTVQ7C; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=hauke-m.de header.i=@hauke-m.de header.a=rsa-sha256 header.s=MBO0001 header.b=RXqY2qXj; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4D6S0G18Qlz9sSf for ; Fri, 1 Jan 2021 12:21:16 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=JJsUquBIQXc5X92SRz+evhX385McOKZ20IJUISLtUGg=; b=ODOTVQ7CtfKDhEXHDco2Jdw6/ MLMKqPWrkmW9/kGQ42cAbVY83lNgyiPtMRk/dfIifsYs0gznL4zpfDPMa39NJkeKh2Em3ZM/ei8or 7eEznoHHyfkiPnLxYa0AF/00gK+7NqFXJV+E0cCn8JZului4bd2MbHo42/1gH4CRPbihoeljgcmm3 k++YSKWOHFuCCpBRALuFstnmBehCM0daaFZcU0wPoMV3fz4h6J61U9+esKUXkTk9d4zQjBs6sifT6 XLw2CrNEXbSFIYFNrHzxkQeGbXsAAY6HABiZ9r/s1pPMCc3GQkKtt5R6KscWHPvJgKLmG/7hriDuu /MXmCZLBQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kv95U-0000td-3a; Fri, 01 Jan 2021 01:18:40 +0000 Received: from mout-p-202.mailbox.org ([80.241.56.172]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kv95I-0000rj-NV for openwrt-devel@lists.openwrt.org; Fri, 01 Jan 2021 01:18:31 +0000 Received: from smtp2.mailbox.org (smtp2.mailbox.org [80.241.60.241]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4D6Rww3zg1zQlRy; Fri, 1 Jan 2021 02:18:24 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hauke-m.de; s=MBO0001; t=1609463902; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8By4NjUcf1BEoxKjVsEDhcmi0G+UGK7sv8+jzGwLRh0=; b=RXqY2qXjC1kAKQunYms3RtBSqsW+5x49AFp9H/OGFUMOZ+yOuMO9GoSfqgn8HjZ12dJ4Ac fFjE5tVTEb/f1aSVYspRR1BxKL/dtmSo7uaCo66PAGDbdpFxCRMps8M+HMi+Rk3CUhSZRd fOFktbCsSjzUL2UOE7/UIlA7ek3TKlGws2rybVKVdbCS0nfn+8/cMZ5TS1TQbZCVaseewv aPxi4IGiCh8enKXnQnkD0cIj+omH7XPw93IVXrBY0fvSfhfTdA5wLmDh+4Ztkk4pvYvEkC 0XsHy2q5fOOYHEWA9t/UMgzmLyyBsB075AUESvcVLFRO6NX+4eLp7BsFAK32QA== Received: from smtp2.mailbox.org ([80.241.60.241]) by spamfilter04.heinlein-hosting.de (spamfilter04.heinlein-hosting.de [80.241.56.122]) (amavisd-new, port 10030) with ESMTP id UbdTawH7HljX; Fri, 1 Jan 2021 02:18:21 +0100 (CET) From: Hauke Mehrtens To: openwrt-devel@lists.openwrt.org Subject: [PATCH uhttpd 2/3] listen: Copy only parts of ai_addr Date: Fri, 1 Jan 2021 02:17:58 +0100 Message-Id: <20210101011759.21086-2-hauke@hauke-m.de> In-Reply-To: <20210101011759.21086-1-hauke@hauke-m.de> References: <20210101011759.21086-1-hauke@hauke-m.de> MIME-Version: 1.0 X-MBO-SPAM-Probability: X-Rspamd-Score: -5.25 / 15.00 / 15.00 X-Rspamd-Queue-Id: B1A2C1724 X-Rspamd-UID: f6b33b X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201231_201829_237255_DF24AB36 X-CRM114-Status: GOOD ( 13.57 ) X-Spam-Score: -0.9 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [80.241.56.172 listed in list.dnswl.org] 0.0 RCVD_IN_MSPIKE_H4 RBL: Very Good reputation (+4) [80.241.56.172 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Hauke Mehrtens Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org ai_addr has different sizes for IPv4 and IPv6. Only copy the parts which are actually used and not the full array, to not copy and uninitialized memory. This fixes a warning found with the address sanitizer. Signed-off-by: Hauke Mehrtens --- listen.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/listen.c b/listen.c index 2a54888..558e35e 100644 --- a/listen.c +++ b/listen.c @@ -29,7 +29,10 @@ struct listener { struct uloop_fd fd; int socket; int n_clients; - struct sockaddr_in6 addr; + union { + struct sockaddr_in6 addr6; + struct sockaddr_in addr; + }; bool tls; bool blocked; }; @@ -189,7 +192,9 @@ int uh_socket_bind(const char *host, const char *port, bool tls) l->fd.fd = sock; l->tls = tls; - l->addr = *(struct sockaddr_in6 *)p->ai_addr; + if (p->ai_addrlen < sizeof(l->addr)) + goto error; + memcpy(&l->addr, p->ai_addr, p->ai_addrlen); list_add_tail(&l->list, &listeners); bound++; @@ -211,13 +216,13 @@ int uh_first_tls_port(int family) int tls_port = -1; list_for_each_entry(l, &listeners, list) { - if (!l->tls || l->addr.sin6_family != family) + if (!l->tls || l->addr.sin_family != family) continue; - if (tls_port != -1 && ntohs(l->addr.sin6_port) != 443) + if (tls_port != -1 && ntohs(l->addr.sin_port) != 443) continue; - tls_port = ntohs(l->addr.sin6_port); + tls_port = ntohs(l->addr.sin_port); } return tls_port;