bpf: net: Change do_ip_getsockopt() to take the sockptr_t argument
[ Upstream commit 728f064c ] Similar to the earlier patch that changes sk_getsockopt() to take the sockptr_t argument. This patch also changes do_ip_getsockopt() to take the sockptr_t argument such that a latter patch can make bpf_getsockopt(SOL_IP) to reuse do_ip_getsockopt(). Note on the change in ip_mc_gsfget(). This function is to return an array of sockaddr_storage in optval. This function is shared between ip_get_mcast_msfilter() and compat_ip_get_mcast_msfilter(). However, the sockaddr_storage is stored at different offset of the optval because of the difference between group_filter and compat_group_filter. Thus, a new 'ss_offset' argument is added to ip_mc_gsfget(). Signed-off-by:Martin KaFai Lau <martin.lau@kernel.org> Link: https://lore.kernel.org/r/20220902002828.2890585-1-kafai@fb.com Signed-off-by:
Alexei Starovoitov <ast@kernel.org> Stable-dep-of: 5c3be3e0 ("ipmr: fix incorrect parameter validation in the ip_mroute_getsockopt() function") Signed-off-by:
Sasha Levin <sashal@kernel.org>
Showing
- include/linux/igmp.h 2 additions, 2 deletionsinclude/linux/igmp.h
- include/linux/mroute.h 3 additions, 3 deletionsinclude/linux/mroute.h
- net/ipv4/igmp.c 13 additions, 9 deletionsnet/ipv4/igmp.c
- net/ipv4/ip_sockglue.c 45 additions, 35 deletionsnet/ipv4/ip_sockglue.c
- net/ipv4/ipmr.c 5 additions, 4 deletionsnet/ipv4/ipmr.c
Loading