Skip to content

Commit

Permalink
net: Use sockaddr_storage for getsockopt(SO_PEERNAME).
Browse files Browse the repository at this point in the history
[ Upstream commit 8936bf5 ]

Commit df8fc4e ("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 06d4c8a ("af_unix: Fix fortify_panic() in unix_bind_bsd().")
 commit ecb4534 ("af_unix: Terminate sun_path when bind()ing pathname socket.")
 commit a0ade84 ("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 <kuniyu@amazon.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Reviewed-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
q2ven authored and gregkh committed Sep 23, 2023
1 parent faaf956 commit a9c24ff
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions net/core/sock.c
Expand Up @@ -1824,14 +1824,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;
}
Expand Down

0 comments on commit a9c24ff

Please sign in to comment.