This is a note to let you know that I've just added the patch titled
bpf: Check the validity of max_rdwr_access for sock local storage map iterator
to the 5.15-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
bpf-check-the-validity-of-max_rdwr_access-for-sock-local-storage-map-iterator.patch
and it can be found in the queue-5.15 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 52bd05eb7c88e1ad8541a48873188ccebca9da26 Mon Sep 17 00:00:00 2001
From: Hou Tao <houtao1@xxxxxxxxxx>
Date: Wed, 10 Aug 2022 16:05:34 +0800
Subject: bpf: Check the validity of max_rdwr_access for sock local storage map iterator
From: Hou Tao <houtao1@xxxxxxxxxx>
commit 52bd05eb7c88e1ad8541a48873188ccebca9da26 upstream.
The value of sock local storage map is writable in map iterator, so check
max_rdwr_access instead of max_rdonly_access.
Fixes: 5ce6e77c7edf ("bpf: Implement bpf iterator for sock local storage map")
Signed-off-by: Hou Tao <houtao1@xxxxxxxxxx>
Acked-by: Yonghong Song <yhs@xxxxxx>
Acked-by: Martin KaFai Lau <kafai@xxxxxx>
Link: https://lore.kernel.org/r/20220810080538.1845898-6-houtao@xxxxxxxxxxxxxxx
Signed-off-by: Alexei Starovoitov <ast@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
net/core/bpf_sk_storage.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/net/core/bpf_sk_storage.c
+++ b/net/core/bpf_sk_storage.c
@@ -894,7 +894,7 @@ static int bpf_iter_attach_map(struct bp
if (map->map_type != BPF_MAP_TYPE_SK_STORAGE)
goto put_map;
- if (prog->aux->max_rdonly_access > map->value_size) {
+ if (prog->aux->max_rdwr_access > map->value_size) {
err = -EACCES;
goto put_map;
}
Patches currently in stable-queue which might be from houtao1@xxxxxxxxxx are
queue-5.15/bpf-acquire-map-uref-in-.init_seq_private-for-array-map-iterator.patch
queue-5.15/bpf-acquire-map-uref-in-.init_seq_private-for-sock-map-hash-iterator.patch
queue-5.15/bpf-acquire-map-uref-in-.init_seq_private-for-hash-map-iterator.patch
queue-5.15/bpf-acquire-map-uref-in-.init_seq_private-for-sock-local-storage-map-iterator.patch
queue-5.15/bpf-check-the-validity-of-max_rdwr_access-for-sock-local-storage-map-iterator.patch
