Commit b55b39ad authored by Stanislav Fomichev's avatar Stanislav Fomichev Committed by Zheng Zengkai
Browse files

bpf: Allow bpf_{s,g}etsockopt from cgroup bind{4,6} hooks 

mainline inclusion
from mainline-v5.11-rc1
commit 427167c0
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I4GII8?from=project-issue


CVE: NA

---------

I have to now lock/unlock socket for the bind hook execution.
That shouldn't cause any overhead because the socket is unbound
and shouldn't receive any traffic.

Signed-off-by: default avatarStanislav Fomichev <sdf@google.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Acked-by: default avatarAndrey Ignatov <rdna@fb.com>
Link: https://lore.kernel.org/bpf/20201202172516.3483656-3-sdf@google.com


Signed-off-by: default avatarLu Jialin <lujialin4@huawei.com>
Reviewed-by: default avatarWei <Yongjun&lt;weiyongjun1@huawei.com>
Reviewed-by: default avatarweiyang wang <wangweiyang2@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent a62969d3

include/linux/bpf-cgroup.h

+6 −6
Original line number Original line Diff line number Diff line
@@ -253,11 +253,11 @@ int bpf_percpu_cgroup_storage_update(struct bpf_map *map, void *key, 
	__ret;								       \

	__ret;								       \

})

})





#define BPF_CGROUP_RUN_PROG_INET4_BIND(sk, uaddr)			       \

#define BPF_CGROUP_RUN_PROG_INET4_BIND_LOCK(sk, uaddr)			       \

	BPF_CGROUP_RUN_SA_PROG(sk, uaddr, BPF_CGROUP_INET4_BIND)

	BPF_CGROUP_RUN_SA_PROG_LOCK(sk, uaddr, BPF_CGROUP_INET4_BIND, NULL)





#define BPF_CGROUP_RUN_PROG_INET6_BIND(sk, uaddr)			       \

#define BPF_CGROUP_RUN_PROG_INET6_BIND_LOCK(sk, uaddr)			       \

	BPF_CGROUP_RUN_SA_PROG(sk, uaddr, BPF_CGROUP_INET6_BIND)

	BPF_CGROUP_RUN_SA_PROG_LOCK(sk, uaddr, BPF_CGROUP_INET6_BIND, NULL)





#define BPF_CGROUP_PRE_CONNECT_ENABLED(sk) (cgroup_bpf_enabled && \

#define BPF_CGROUP_PRE_CONNECT_ENABLED(sk) (cgroup_bpf_enabled && \

					    sk->sk_prot->pre_connect)

					    sk->sk_prot->pre_connect)
@@ -439,8 +439,8 @@ static inline int bpf_percpu_cgroup_storage_update(struct bpf_map *map, 
#define BPF_CGROUP_RUN_PROG_INET_EGRESS(sk,skb) ({ 0; })

#define BPF_CGROUP_RUN_PROG_INET_EGRESS(sk,skb) ({ 0; })

#define BPF_CGROUP_RUN_PROG_INET_SOCK(sk) ({ 0; })

#define BPF_CGROUP_RUN_PROG_INET_SOCK(sk) ({ 0; })

#define BPF_CGROUP_RUN_PROG_INET_SOCK_RELEASE(sk) ({ 0; })

#define BPF_CGROUP_RUN_PROG_INET_SOCK_RELEASE(sk) ({ 0; })

#define BPF_CGROUP_RUN_PROG_INET4_BIND(sk, uaddr) ({ 0; })

#define BPF_CGROUP_RUN_PROG_INET4_BIND_LOCK(sk, uaddr) ({ 0; })

#define BPF_CGROUP_RUN_PROG_INET6_BIND(sk, uaddr) ({ 0; })

#define BPF_CGROUP_RUN_PROG_INET6_BIND_LOCK(sk, uaddr) ({ 0; })

#define BPF_CGROUP_RUN_PROG_INET4_POST_BIND(sk) ({ 0; })

#define BPF_CGROUP_RUN_PROG_INET4_POST_BIND(sk) ({ 0; })

#define BPF_CGROUP_RUN_PROG_INET6_POST_BIND(sk) ({ 0; })

#define BPF_CGROUP_RUN_PROG_INET6_POST_BIND(sk) ({ 0; })

#define BPF_CGROUP_RUN_PROG_INET4_CONNECT(sk, uaddr) ({ 0; })

#define BPF_CGROUP_RUN_PROG_INET4_CONNECT(sk, uaddr) ({ 0; })

net/core/filter.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -6995,6 +6995,8 @@ sock_addr_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog) 
		return &bpf_sk_storage_delete_proto;

		return &bpf_sk_storage_delete_proto;

	case BPF_FUNC_setsockopt:

	case BPF_FUNC_setsockopt:

		switch (prog->expected_attach_type) {

		switch (prog->expected_attach_type) {

		case BPF_CGROUP_INET4_BIND:

		case BPF_CGROUP_INET6_BIND:

		case BPF_CGROUP_INET4_CONNECT:

		case BPF_CGROUP_INET4_CONNECT:

		case BPF_CGROUP_INET6_CONNECT:

		case BPF_CGROUP_INET6_CONNECT:

			return &bpf_sock_addr_setsockopt_proto;

			return &bpf_sock_addr_setsockopt_proto;
@@ -7003,6 +7005,8 @@ sock_addr_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog) 
		}

		}

	case BPF_FUNC_getsockopt:

	case BPF_FUNC_getsockopt:

		switch (prog->expected_attach_type) {

		switch (prog->expected_attach_type) {

		case BPF_CGROUP_INET4_BIND:

		case BPF_CGROUP_INET6_BIND:

		case BPF_CGROUP_INET4_CONNECT:

		case BPF_CGROUP_INET4_CONNECT:

		case BPF_CGROUP_INET6_CONNECT:

		case BPF_CGROUP_INET6_CONNECT:

			return &bpf_sock_addr_getsockopt_proto;

			return &bpf_sock_addr_getsockopt_proto;

net/ipv4/af_inet.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -450,7 +450,7 @@ int inet_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) 
	/* BPF prog is run before any checks are done so that if the prog

	/* BPF prog is run before any checks are done so that if the prog

	 * changes context in a wrong way it will be caught.

	 * changes context in a wrong way it will be caught.

	 */

	 */

	err = BPF_CGROUP_RUN_PROG_INET4_BIND(sk, uaddr);

	err = BPF_CGROUP_RUN_PROG_INET4_BIND_LOCK(sk, uaddr);

	if (err)

	if (err)

		return err;

		return err;

net/ipv6/af_inet6.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -451,7 +451,7 @@ int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) 
	/* BPF prog is run before any checks are done so that if the prog

	/* BPF prog is run before any checks are done so that if the prog

	 * changes context in a wrong way it will be caught.

	 * changes context in a wrong way it will be caught.

	 */

	 */

	err = BPF_CGROUP_RUN_PROG_INET6_BIND(sk, uaddr);

	err = BPF_CGROUP_RUN_PROG_INET6_BIND_LOCK(sk, uaddr);

	if (err)

	if (err)

		return err;

		return err;