Merge branch 'x86/cache' into perf/core, to pick up fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 4 insertions, 1 deletions

diff --git a/kernel/bpf/local_storage.c b/kernel/bpf/local_storage.c
index 22ad967d1e5f..830d7f095748 100644
--- a/kernel/bpf/local_storage.c
+++ b/kernel/bpf/local_storage.c
@@ -129,7 +129,7 @@ static int cgroup_storage_update_elem(struct bpf_map *map, void *_key,
         struct bpf_cgroup_storage *storage;
         struct bpf_storage_buffer *new;
 
-        if (flags & BPF_NOEXIST)
+        if (flags != BPF_ANY && flags != BPF_EXIST)
                 return -EINVAL;
 
         storage = cgroup_storage_lookup((struct bpf_cgroup_storage_map *)map,
@@ -195,6 +195,9 @@ static struct bpf_map *cgroup_storage_map_alloc(union bpf_attr *attr)
         if (attr->key_size != sizeof(struct bpf_cgroup_storage_key))
                 return ERR_PTR(-EINVAL);
 
+        if (attr->value_size == 0)
+                return ERR_PTR(-EINVAL);
+
         if (attr->value_size > PAGE_SIZE)
                 return ERR_PTR(-E2BIG);