]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
vsock: use sizeof(struct sockaddr_storage) instead of magic value
authorWang Liang <wangliang74@huawei.com>
Tue, 12 Aug 2025 01:59:29 +0000 (09:59 +0800)
committerJakub Kicinski <kuba@kernel.org>
Thu, 14 Aug 2025 00:05:21 +0000 (17:05 -0700)
Previous commit 230b183921ec ("net: Use standard structures for generic
socket address structures.") use 'struct sockaddr_storage address;'
to replace 'char address[MAX_SOCK_ADDR];'.

The macro MAX_SOCK_ADDR is removed by commit 01893c82b4e6 ("net: Remove
MAX_SOCK_ADDR constant").

The comment in vsock_getname() is outdated, use sizeof(struct
sockaddr_storage) instead of magic value 128.

Signed-off-by: Wang Liang <wangliang74@huawei.com>
Link: https://patch.msgid.link/20250812015929.1419896-1-wangliang74@huawei.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/vmw_vsock/af_vsock.c

index ead6a3c14b87921e7de69fc94b4f921d84ab71a4..f7b2d61d1d16a8660db2918561ef082b4a512c7b 100644 (file)
@@ -1028,12 +1028,7 @@ static int vsock_getname(struct socket *sock,
                vm_addr = &vsk->local_addr;
        }
 
-       /* sys_getsockname() and sys_getpeername() pass us a
-        * MAX_SOCK_ADDR-sized buffer and don't set addr_len.  Unfortunately
-        * that macro is defined in socket.c instead of .h, so we hardcode its
-        * value here.
-        */
-       BUILD_BUG_ON(sizeof(*vm_addr) > 128);
+       BUILD_BUG_ON(sizeof(*vm_addr) > sizeof(struct sockaddr_storage));
        memcpy(addr, vm_addr, sizeof(*vm_addr));
        err = sizeof(*vm_addr);