2 files changed, 18 insertions, 11 deletions

diff --git a/kernel/bpf/sockmap.c b/kernel/bpf/sockmap.c
index f6ffde9c6a68..6424ce0e4969 100644
--- a/kernel/bpf/sockmap.c
+++ b/kernel/bpf/sockmap.c
@@ -792,7 +792,7 @@ out_progs:
         return err;
 }
 
-int sock_map_attach_prog(struct bpf_map *map, struct bpf_prog *prog, u32 type)
+int sock_map_prog(struct bpf_map *map, struct bpf_prog *prog, u32 type)
 {
         struct bpf_stab *stab = container_of(map, struct bpf_stab, map);
         struct bpf_prog *orig;
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index 70ad8e220343..cb17e1cd1d43 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -1096,10 +1096,10 @@ static int bpf_obj_get(const union bpf_attr *attr)
 
 #define BPF_PROG_ATTACH_LAST_FIELD attach_flags
 
-static int sockmap_get_from_fd(const union bpf_attr *attr)
+static int sockmap_get_from_fd(const union bpf_attr *attr, bool attach)
 {
+        struct bpf_prog *prog = NULL;
         int ufd = attr->target_fd;
-        struct bpf_prog *prog;
         struct bpf_map *map;
         struct fd f;
         int err;
@@ -1109,16 +1109,20 @@ static int sockmap_get_from_fd(const union bpf_attr *attr)
         if (IS_ERR(map))
                 return PTR_ERR(map);
 
-        prog = bpf_prog_get_type(attr->attach_bpf_fd, BPF_PROG_TYPE_SK_SKB);
-        if (IS_ERR(prog)) {
-                fdput(f);
-                return PTR_ERR(prog);
+        if (attach) {
+                prog = bpf_prog_get_type(attr->attach_bpf_fd,
+                                         BPF_PROG_TYPE_SK_SKB);
+                if (IS_ERR(prog)) {
+                        fdput(f);
+                        return PTR_ERR(prog);
+                }
         }
 
-        err = sock_map_attach_prog(map, prog, attr->attach_type);
+        err = sock_map_prog(map, prog, attr->attach_type);
         if (err) {
                 fdput(f);
-                bpf_prog_put(prog);
+                if (prog)
+                        bpf_prog_put(prog);
                 return err;
         }
 
@@ -1155,7 +1159,7 @@ static int bpf_prog_attach(const union bpf_attr *attr)
                 break;
         case BPF_SK_SKB_STREAM_PARSER:
         case BPF_SK_SKB_STREAM_VERDICT:
-                return sockmap_get_from_fd(attr);
+                return sockmap_get_from_fd(attr, true);
         default:
                 return -EINVAL;
         }
@@ -1204,7 +1208,10 @@ static int bpf_prog_detach(const union bpf_attr *attr)
                 ret = cgroup_bpf_update(cgrp, NULL, attr->attach_type, false);
                 cgroup_put(cgrp);
                 break;
-
+        case BPF_SK_SKB_STREAM_PARSER:
+        case BPF_SK_SKB_STREAM_VERDICT:
+                ret = sockmap_get_from_fd(attr, false);
+                break;
         default:
                 return -EINVAL;
         }