diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2022-12-20 15:02:03 -0800 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2022-12-20 15:02:03 -0800 |
| commit | 1644d755d0b06d0f1ee93e1c44336c29386546b4 (patch) | |
| tree | 58f4fb795fed3f4b2c1cb6bbac9ed25b3134d390 /kernel/bpf/bpf_struct_ops.c | |
| parent | b29e6ece454f7f4822b40441da393c3969c312b3 (diff) | |
| parent | b6bb9676f2165d518b35ba3bea5f1fcfc0d969bf (diff) | |
Merge branch 'linus'
Diffstat (limited to 'kernel/bpf/bpf_struct_ops.c')
| -rw-r--r-- | kernel/bpf/bpf_struct_ops.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/bpf/bpf_struct_ops.c b/kernel/bpf/bpf_struct_ops.c index 84b2d9dba79a..ece9870cab68 100644 --- a/kernel/bpf/bpf_struct_ops.c +++ b/kernel/bpf/bpf_struct_ops.c @@ -494,8 +494,7 @@ static int bpf_struct_ops_map_update_elem(struct bpf_map *map, void *key, refcount_set(&kvalue->refcnt, 1); bpf_map_inc(map); - set_memory_ro((long)st_map->image, 1); - set_memory_x((long)st_map->image, 1); + set_memory_rox((long)st_map->image, 1); err = st_ops->reg(kdata); if (likely(!err)) { /* Pair with smp_load_acquire() during lookup_elem(). |