net: Use sockaddr_storage for getsockopt(SO_PEERNAME).
Subsystems (3)
PATCH v2 1/1 net: Use sockaddr_storage for getsockopt(SO_PEERNAME).
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.
---
v2:
* Add Reviewed-by
* s/implicitly/explicitly/ in changelog
* Replace Link with commits
v1: https://lore.kernel.org/netdev/[email protected]/
--- net/core/sock.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
net/core/sock.c +3 -3
@@ -1806,14 +1806,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; }
Signature · 1 line
2.30.2
This patch was applied to netdev/net-next.git (main) by David S. Miller <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (main) by David S. Miller <[email protected]>:
Quoted 8 lines · On Fri, 28 Jul 2023 17:48:13 -0700 you wrote:
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_XXXstruct, which is cast fromsockaddr_storageand has a bigger size than fortified functions expect. See these commits:[...]
Here is the summary with links:
- [v2,net-next] net: Use sockaddr_storage for getsockopt(SO_PEERNAME).
https://git.kernel.org/netdev/net-next/c/8936bf53a091
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html