From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4273A156CA for ; Fri, 8 Sep 2023 18:16:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 61DBFC4167D; Fri, 8 Sep 2023 18:16:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1694196995; bh=dEO0VQcgl6um/+/kLzNa0ZIjMeP1VbtIsaHEwaZCn10=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=X4T4LMFc1kyIfbVLkOnV2gjGjbuNoXg9LQPoswptqEA7chztFVn+xDHsJ4UYZ4x2n s5hdacoVdDIoUjtA/RFfl34r6ZnJ6DlLMD/slfRagakdCIiJE3ZtmMKilW3kVRvivg nL7a2Aaqma8juFCwdPNFt/p9KUiKwE6PjkBv2Mt1t6fZ/IIWK//Wx/15j+CEwO6ybr 2JJNwDqi5v+5ig6tJYMHONQoCqmldiXPbsdA9XFvJH6OUyCtrdaBrOGPPWUFAp+50R ErT78CuzNFze5G74RVa5NIXSKoX7SzMuNNg3a0uWU/LchZyNMGHPJ3oknWgFPh5Mc+ HbUYRC42sYEnQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Kuniyuki Iwashima , Eric Dumazet , Willem de Bruijn , "David S . Miller" , Sasha Levin , kuba@kernel.org, pabeni@redhat.com, alexander@mihalicyn.com, leitao@debian.org, lucien.xin@gmail.com, dhowells@redhat.com, kernelxing@tencent.com, andriy.shevchenko@linux.intel.com, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 6.4 13/41] net: Use sockaddr_storage for getsockopt(SO_PEERNAME). Date: Fri, 8 Sep 2023 14:15:27 -0400 Message-Id: <20230908181555.3459640-13-sashal@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230908181555.3459640-1-sashal@kernel.org> References: <20230908181555.3459640-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.4.15 Content-Transfer-Encoding: 8bit From: Kuniyuki Iwashima [ Upstream commit 8936bf53a091ad6a34b480c22002f1cb2422ab38 ] Commit df8fc4e934c1 ("kbuild: Enable -fstrict-flex-arrays=3") started applying strict rules to standard string functions. It does not work well with conventional socket code around each protocol- specific sockaddr_XXX struct, which is cast from sockaddr_storage and has a bigger size than fortified functions expect. See these commits: commit 06d4c8a80836 ("af_unix: Fix fortify_panic() in unix_bind_bsd().") commit ecb4534b6a1c ("af_unix: Terminate sun_path when bind()ing pathname socket.") commit a0ade8404c3b ("af_packet: Fix warning of fortified memcpy() in packet_getname().") We must cast the protocol-specific address back to sockaddr_storage to call such functions. However, in the case of getsockaddr(SO_PEERNAME), the rationale is a bit unclear as the buffer is defined by char[128] which is the same size as sockaddr_storage. Let's use sockaddr_storage explicitly. Signed-off-by: Kuniyuki Iwashima Reviewed-by: Eric Dumazet Reviewed-by: Willem de Bruijn Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/core/sock.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/core/sock.c b/net/core/sock.c index 8451a95266bf0..0bb45f0d5f13f 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -1771,14 +1771,14 @@ int sk_getsockopt(struct sock *sk, int level, int optname, case SO_PEERNAME: { - char address[128]; + struct sockaddr_storage address; - lv = sock->ops->getname(sock, (struct sockaddr *)address, 2); + lv = sock->ops->getname(sock, (struct sockaddr *)&address, 2); if (lv < 0) return -ENOTCONN; if (lv < len) return -EINVAL; - if (copy_to_sockptr(optval, address, len)) + if (copy_to_sockptr(optval, &address, len)) return -EFAULT; goto lenout; } -- 2.40.1