Commit 4d18083d authored by Wang Liang's avatar Wang Liang Committed by Jakub Kicinski
Browse files

vsock: use sizeof(struct sockaddr_storage) instead of magic value 



Previous commit 230b1839 ("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 01893c82 ("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: default avatarWang Liang <wangliang74@huawei.com>
Link: https://patch.msgid.link/20250812015929.1419896-1-wangliang74@huawei.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent b9970c4d

net/vmw_vsock/af_vsock.c

+1 −6
Original line number Diff line number Diff line
@@ -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);