1 files changed, 9 insertions, 5 deletions

diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index e24aa3241387..3aeb4ea2a93a 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -1315,7 +1315,8 @@ 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, bool attach)
+static int sockmap_get_from_fd(const union bpf_attr *attr,
+                               int type, bool attach)
 {
         struct bpf_prog *prog = NULL;
         int ufd = attr->target_fd;
@@ -1329,8 +1330,7 @@ static int sockmap_get_from_fd(const union bpf_attr *attr, bool attach)
                 return PTR_ERR(map);
 
         if (attach) {
-                prog = bpf_prog_get_type(attr->attach_bpf_fd,
-                                         BPF_PROG_TYPE_SK_SKB);
+                prog = bpf_prog_get_type(attr->attach_bpf_fd, type);
                 if (IS_ERR(prog)) {
                         fdput(f);
                         return PTR_ERR(prog);
@@ -1382,9 +1382,11 @@ static int bpf_prog_attach(const union bpf_attr *attr)
         case BPF_CGROUP_DEVICE:
                 ptype = BPF_PROG_TYPE_CGROUP_DEVICE;
                 break;
+        case BPF_SK_MSG_VERDICT:
+                return sockmap_get_from_fd(attr, BPF_PROG_TYPE_SK_MSG, true);
         case BPF_SK_SKB_STREAM_PARSER:
         case BPF_SK_SKB_STREAM_VERDICT:
-                return sockmap_get_from_fd(attr, true);
+                return sockmap_get_from_fd(attr, BPF_PROG_TYPE_SK_SKB, true);
         default:
                 return -EINVAL;
         }
@@ -1437,9 +1439,11 @@ static int bpf_prog_detach(const union bpf_attr *attr)
         case BPF_CGROUP_DEVICE:
                 ptype = BPF_PROG_TYPE_CGROUP_DEVICE;
                 break;
+        case BPF_SK_MSG_VERDICT:
+                return sockmap_get_from_fd(attr, BPF_PROG_TYPE_SK_MSG, false);
         case BPF_SK_SKB_STREAM_PARSER:
         case BPF_SK_SKB_STREAM_VERDICT:
-                return sockmap_get_from_fd(attr, false);
+                return sockmap_get_from_fd(attr, BPF_PROG_TYPE_SK_SKB, false);
         default:
                 return -EINVAL;
         }