bpf: sockmap: Require attach_bpf_fd when detaching a program
Subsystems (2)
PATCH 1/1 bpf: sockmap: Require attach_bpf_fd when detaching a program
commit bb0de3131f4c60a9bf976681e0fe4d1e55c7a821 upstream.
The sockmap code currently ignores the value of attach_bpf_fd when detaching a program. This is contrary to the usual behaviour of checking that attach_bpf_fd represents the currently attached program.
Ensure that attach_bpf_fd is indeed the currently attached program. It turns out that all sockmap selftests already do this, which indicates that this is unlikely to cause breakage.
---
The 5.4 tree needs a dedicated backport, since some headers have changed sufficiently to cause the patch to fail. bpf_prog_detach needs further massaging to pass the correct program type to sock_map_prog_detach. Please queue this patch together with commit f43cb0d672aa ("selftests: bpf: Fix detach from sockmap tests").
--- include/linux/bpf.h | 13 +++++++++-- include/linux/skmsg.h | 13 +++++++++++ kernel/bpf/syscall.c | 4 ++-- net/core/sock_map.c | 50 ++++++++++++++++++++++++++++++++++++++----- 4 files changed, 71 insertions(+), 9 deletions(-)
include/linux/bpf.h +11 -2
@@ -956,11 +956,14 @@ static inline void bpf_map_offload_map_free(struct bpf_map *map)#endif /* CONFIG_NET && CONFIG_BPF_SYSCALL */ #if defined(CONFIG_BPF_STREAM_PARSER ) -int sock_map_prog_update (struct bpf_map *map,struct bpf_prog *prog,u32 which); +int sock_map_prog_update (struct bpf_map *map,struct bpf_prog *prog, +struct bpf_prog *old,u32 which);int sock_map_get_from_fd (const union bpf_attr *attr,struct bpf_prog *prog); +int sock_map_prog_detach (const union bpf_attr *attr,enum bpf_prog_type ptype);#else static inline int sock_map_prog_update (struct bpf_map *map, -struct bpf_prog *prog,u32 which) +struct bpf_prog *prog, +struct bpf_prog *old,u32 which) {return -EOPNOTSUPP ; }
@@ -970,6 +973,12 @@ static inline int sock_map_get_from_fd(const union bpf_attr *attr, {return -EINVAL ; } + +static inline int sock_map_prog_detach (const union bpf_attr *attr, +enum bpf_prog_type ptype) +{ +return -EOPNOTSUPP ; +}#endif #if defined(CONFIG_XDP_SOCKETS )
include/linux/skmsg.h +13 -0
@@ -450,6 +450,19 @@ static inline void psock_set_prog(struct bpf_prog **pprog,bpf_prog_put (prog); } +static inline int psock_replace_prog (struct bpf_prog **pprog, +struct bpf_prog *prog, +struct bpf_prog *old) +{ +if (cmpxchg (pprog, old, prog) != old) +return -ENOENT ; + +if (old) +bpf_prog_put (old); + +return 0 ; +} +static inline void psock_progs_drop (struct sk_psock_progs *progs) {psock_set_prog (&progs->msg_parser,NULL );
kernel/bpf/syscall.c +2 -2
@@ -2029,10 +2029,10 @@ static int bpf_prog_detach(const union bpf_attr *attr) ptype =BPF_PROG_TYPE_CGROUP_DEVICE ;break ;case BPF_SK_MSG_VERDICT : -return sock_map_get_from_fd (attr,NULL ); +return sock_map_prog_detach (attr,BPF_PROG_TYPE_SK_MSG );case BPF_SK_SKB_STREAM_PARSER :case BPF_SK_SKB_STREAM_VERDICT : -return sock_map_get_from_fd (attr,NULL ); +return sock_map_prog_detach (attr,BPF_PROG_TYPE_SK_SKB );case BPF_LIRC_MODE2 :return lirc_prog_detach (attr);case BPF_FLOW_DISSECTOR :
net/core/sock_map.c +45 -5
79 lines not on this page · raw message
Signature · 1 line
2.25.1
Greg KH
maintainerQuoted 15 lines · Lorenz Bauer
commit
bb0de3131f4c60a9bf976681e0fe4d1e55c7a821upstream.The sockmap code currently ignores the value of
attach_bpf_fdwhen detaching a program. This is contrary to the usual behaviour of checking thatattach_bpf_fdrepresents the currently attached program.Ensure that
attach_bpf_fdis indeed the currently attached program. It turns out that all sockmap selftests already do this, which indicates that this is unlikely to cause breakage.Fixes 604326b41a6f ("bpf, sockmap: convert to generic sk_msg interface")Signed-off-by Lorenz Bauer <[email protected]>Signed-off-by Alexei Starovoitov <[email protected]>
Quoted 6 lines
---
The 5.4 tree needs a dedicated backport, since some headers have changed sufficiently to cause the patch to fail.bpf_prog_detachneeds further massaging to pass the correct program type tosock_map_prog_detach. Please queue this patch together with commitf43cb0d672aa("selftests: bpf: Fix detach from sockmap tests").
Thanks for the backport, now queued up.
greg k-h