| Message ID | 20231013185702.3993710-1-martin.lau@linux.dev (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 9c1292eca243821249fa99f40175b0660d9329e3 |
| Delegated to: | BPF |
| Headers | show |
| Series | [bpf-next] net/bpf: Avoid unused "sin_addr_len" warning when CONFIG_CGROUP_BPF is not set | expand |
From: Martin KaFai Lau <martin.lau@linux.dev> Date: Fri, 13 Oct 2023 11:57:02 -0700 > From: Martin KaFai Lau <martin.lau@kernel.org> > > 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);". > > Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> > Closes: https://lore.kernel.org/bpf/20231013114007.2fb09691@canb.auug.org.au/ > Cc: Daan De Meyer <daan.j.demeyer@gmail.com> > Fixes: fefba7d1ae19 ("bpf: Propagate modified uaddrlen from cgroup sockaddr programs") > Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org> Reviewed-by: Kuniyuki Iwashima <kuniyu@amazon.com> Thanks! > --- > net/ipv4/af_inet.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c > index 7e27ad37b939..5ce275b2d7ef 100644 > --- a/net/ipv4/af_inet.c > +++ b/net/ipv4/af_inet.c > @@ -814,7 +814,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); > > -- > 2.34.1
Hello: This patch was applied to bpf/bpf-next.git (master) by Andrii Nakryiko <andrii@kernel.org>: On Fri, 13 Oct 2023 11:57:02 -0700 you wrote: > From: Martin KaFai Lau <martin.lau@kernel.org> > > 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);". > > [...] Here is the summary with links: - [bpf-next] net/bpf: Avoid unused "sin_addr_len" warning when CONFIG_CGROUP_BPF is not set https://git.kernel.org/bpf/bpf-next/c/9c1292eca243 You are awesome, thank you!
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index 7e27ad37b939..5ce275b2d7ef 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c @@ -814,7 +814,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);