Commit 0b20a133 authored by Alexei Starovoitov's avatar Alexei Starovoitov
Browse files

Merge branch 'bpf: net: Remove duplicated code from bpf_getsockopt()' 

Martin KaFai Lau says:

====================

From: Martin KaFai Lau <martin.lau@kernel.org>

The earlier commits [0] removed duplicated code from bpf_setsockopt().
This series is to remove duplicated code from bpf_getsockopt().

Unlike the setsockopt() which had already changed to take
the sockptr_t argument, the same has not been done to
getsockopt().  This is the extra step being done in this
series.

[0]: https://lore.kernel.org/all/20220817061704.4174272-1-kafai@fb.com/



v2:
- The previous v2 did not reach the list. It is a resend.
- Add comments on bpf_getsockopt() should not free
  the saved_syn (Stanislav)
- Explicitly null-terminate the tcp-cc name (Stanislav)
====================

Reviewed-by: default avatarStanislav Fomichev <sdf@google.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parents af515a55 f649f992

include/linux/filter.h

+1 −2
Original line number Diff line number Diff line
@@ -900,8 +900,7 @@ int sk_reuseport_attach_filter(struct sock_fprog *fprog, struct sock *sk); 
int sk_reuseport_attach_bpf(u32 ufd, struct sock *sk);

void sk_reuseport_prog_free(struct bpf_prog *prog);

int sk_detach_filter(struct sock *sk);

int sk_get_filter(struct sock *sk, struct sock_filter __user *filter,

		  unsigned int len);

int sk_get_filter(struct sock *sk, sockptr_t optval, unsigned int len);



bool sk_filter_charge(struct sock *sk, struct sk_filter *fp);

void sk_filter_uncharge(struct sock *sk, struct sk_filter *fp);

include/linux/igmp.h

+2 −2
Original line number Diff line number Diff line
@@ -118,9 +118,9 @@ extern int ip_mc_source(int add, int omode, struct sock *sk, 
		struct ip_mreq_source *mreqs, int ifindex);

extern int ip_mc_msfilter(struct sock *sk, struct ip_msfilter *msf,int ifindex);

extern int ip_mc_msfget(struct sock *sk, struct ip_msfilter *msf,

		struct ip_msfilter __user *optval, int __user *optlen);

			sockptr_t optval, sockptr_t optlen);

extern int ip_mc_gsfget(struct sock *sk, struct group_filter *gsf,

			struct sockaddr_storage __user *p);

			sockptr_t optval, size_t offset);

extern int ip_mc_sf_allow(struct sock *sk, __be32 local, __be32 rmt,

			  int dif, int sdif);

extern void ip_mc_init_dev(struct in_device *);

include/linux/mroute.h

+3 −3
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ static inline int ip_mroute_opt(int opt) 
}



int ip_mroute_setsockopt(struct sock *, int, sockptr_t, unsigned int);

int ip_mroute_getsockopt(struct sock *, int, char __user *, int __user *);

int ip_mroute_getsockopt(struct sock *, int, sockptr_t, sockptr_t);

int ipmr_ioctl(struct sock *sk, int cmd, void __user *arg);

int ipmr_compat_ioctl(struct sock *sk, unsigned int cmd, void __user *arg);

int ip_mr_init(void);
@@ -29,8 +29,8 @@ static inline int ip_mroute_setsockopt(struct sock *sock, int optname, 
	return -ENOPROTOOPT;

}



static inline int ip_mroute_getsockopt(struct sock *sock, int optname,

				       char __user *optval, int __user *optlen)

static inline int ip_mroute_getsockopt(struct sock *sk, int optname,

				       sockptr_t optval, sockptr_t optlen)

{

	return -ENOPROTOOPT;

}

include/linux/mroute6.h

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ struct sock; 


#ifdef CONFIG_IPV6_MROUTE

extern int ip6_mroute_setsockopt(struct sock *, int, sockptr_t, unsigned int);

extern int ip6_mroute_getsockopt(struct sock *, int, char __user *, int __user *);

extern int ip6_mroute_getsockopt(struct sock *, int, sockptr_t, sockptr_t);

extern int ip6_mr_input(struct sk_buff *skb);

extern int ip6mr_ioctl(struct sock *sk, int cmd, void __user *arg);

extern int ip6mr_compat_ioctl(struct sock *sk, unsigned int cmd, void __user *arg);
@@ -42,7 +42,7 @@ static inline int ip6_mroute_setsockopt(struct sock *sock, int optname, 


static inline

int ip6_mroute_getsockopt(struct sock *sock,

			  int optname, char __user *optval, int __user *optlen)

			  int optname, sockptr_t optval, sockptr_t optlen)

{

	return -ENOPROTOOPT;

}

include/linux/sockptr.h

+5 −0
Original line number Diff line number Diff line
@@ -64,6 +64,11 @@ static inline int copy_to_sockptr_offset(sockptr_t dst, size_t offset, 
	return 0;

}



static inline int copy_to_sockptr(sockptr_t dst, const void *src, size_t size)

{

	return copy_to_sockptr_offset(dst, 0, src, size);

}



static inline void *memdup_sockptr(sockptr_t src, size_t len)

{

	void *p = kmalloc_track_caller(len, GFP_USER | __GFP_NOWARN);