From: Martin KaFai Lau Date: Fri, 13 Oct 2023 18:57:02 +0000 (-0700) Subject: net/bpf: Avoid unused "sin_addr_len" warning when CONFIG_CGROUP_BPF is not set X-Git-Tag: v6.6.15~59 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4690558e756c70af2b8a548a30629794fc59bb5e;p=thirdparty%2Fkernel%2Fstable.git net/bpf: Avoid unused "sin_addr_len" warning when CONFIG_CGROUP_BPF is not set commit 9c1292eca243821249fa99f40175b0660d9329e3 upstream. It was reported that there is a compiler warning on the unused variable "sin_addr_len" in af_inet.c when CONFIG_CGROUP_BPF is not set. This patch is to address it similar to the ipv6 counterpart in inet6_getname(). It is to "return sin_addr_len;" instead of "return sizeof(*sin);". Fixes: fefba7d1ae19 ("bpf: Propagate modified uaddrlen from cgroup sockaddr programs") Reported-by: Stephen Rothwell Signed-off-by: Martin KaFai Lau Signed-off-by: Andrii Nakryiko Reviewed-by: Kuniyuki Iwashima Link: https://lore.kernel.org/bpf/20231013185702.3993710-1-martin.lau@linux.dev Closes: https://lore.kernel.org/bpf/20231013114007.2fb09691@canb.auug.org.au/ Signed-off-by: Greg Kroah-Hartman --- diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index 7d4d625471f70..1c58bd72e1245 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c @@ -823,7 +823,7 @@ int inet_getname(struct socket *sock, struct sockaddr *uaddr, } release_sock(sk); memset(sin->sin_zero, 0, sizeof(sin->sin_zero)); - return sizeof(*sin); + return sin_addr_len; } EXPORT_SYMBOL(inet_getname);