1 files changed, 5 insertions, 1 deletions

diff --git a/kernel/bpf/arraymap.c b/kernel/bpf/arraymap.c
index 1a6e9861d554..217b10bd9f48 100644
--- a/kernel/bpf/arraymap.c
+++ b/kernel/bpf/arraymap.c
@@ -22,7 +22,7 @@
 #include "map_in_map.h"
 
 #define ARRAY_CREATE_FLAG_MASK \
-        (BPF_F_NUMA_NODE | BPF_F_RDONLY | BPF_F_WRONLY)
+        (BPF_F_NUMA_NODE | BPF_F_ACCESS_MASK)
 
 static void bpf_array_free_percpu(struct bpf_array *array)
 {
@@ -63,6 +63,7 @@ int array_map_alloc_check(union bpf_attr *attr)
         if (attr->max_entries == 0 || attr->key_size != 4 ||
             attr->value_size == 0 ||
             attr->map_flags & ~ARRAY_CREATE_FLAG_MASK ||
+            !bpf_map_flags_access_ok(attr->map_flags) ||
             (percpu && numa_node != NUMA_NO_NODE))
                 return -EINVAL;
 
@@ -472,6 +473,9 @@ static int fd_array_map_alloc_check(union bpf_attr *attr)
         /* only file descriptors can be stored in this type of map */
         if (attr->value_size != sizeof(u32))
                 return -EINVAL;
+        /* Program read-only/write-only not supported for special maps yet. */
+        if (attr->map_flags & (BPF_F_RDONLY_PROG | BPF_F_WRONLY_PROG))
+                return -EINVAL;
         return array_map_alloc_check(attr);
 }