From: Martin KaFai Lau <kafai@fb.com>
To: Hou Tao <houtao@huaweicloud.com>
Cc: bpf@vger.kernel.org, Andrii Nakryiko <andrii@kernel.org>,
Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Yonghong Song <yhs@fb.com>, Song Liu <songliubraving@fb.com>,
KP Singh <kpsingh@kernel.org>,
"David S . Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Stanislav Fomichev <sdf@google.com>, Hao Luo <haoluo@google.com>,
Jiri Olsa <jolsa@kernel.org>,
John Fastabend <john.fastabend@gmail.com>,
Lorenz Bauer <lmb@cloudflare.com>,
houtao1@huawei.com
Subject: Re: [PATCH bpf 5/9] bpf: Check the validity of max_rdwr_access for sk storage map iterator
Date: Tue, 9 Aug 2022 11:46:02 -0700 [thread overview]
Message-ID: <20220809184602.equlp2thcs2j4774@kafai-mbp> (raw)
In-Reply-To: <20220806074019.2756957-6-houtao@huaweicloud.com>
On Sat, Aug 06, 2022 at 03:40:15PM +0800, Hou Tao wrote:
> From: Hou Tao <houtao1@huawei.com>
>
> The value of sock map is writable in map iterator, so check
Not a sock map. It is a sk local storage map.
> 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@huawei.com>
> ---
> net/core/bpf_sk_storage.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/core/bpf_sk_storage.c b/net/core/bpf_sk_storage.c
> index 83b89ba824d7..1b7f385643b4 100644
> --- a/net/core/bpf_sk_storage.c
> +++ b/net/core/bpf_sk_storage.c
> @@ -904,7 +904,7 @@ static int bpf_iter_attach_map(struct bpf_prog *prog,
> 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;
> }
> --
> 2.29.2
>
next prev parent reply other threads:[~2022-08-09 19:07 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-06 7:40 [PATCH bpf 0/9] fixes for bpf map iterator Hou Tao
2022-08-06 7:40 ` [PATCH bpf 1/9] bpf: Acquire map uref in .init_seq_private for array " Hou Tao
2022-08-08 14:53 ` Yonghong Song
2022-08-09 1:07 ` houtao
2022-08-06 7:40 ` [PATCH bpf 2/9] bpf: Acquire map uref in .init_seq_private for hash " Hou Tao
2022-08-08 14:54 ` Yonghong Song
2022-08-06 7:40 ` [PATCH bpf 3/9] bpf: Acquire map uref in .init_seq_private for sock local storage " Hou Tao
2022-08-08 14:54 ` Yonghong Song
2022-08-06 7:40 ` [PATCH bpf 4/9] bpf: Acquire map uref in .init_seq_private for sock{map,hash} iterator Hou Tao
2022-08-08 14:55 ` Yonghong Song
2022-08-06 7:40 ` [PATCH bpf 5/9] bpf: Check the validity of max_rdwr_access for sk storage map iterator Hou Tao
2022-08-08 14:56 ` Yonghong Song
2022-08-09 18:46 ` Martin KaFai Lau [this message]
2022-08-10 1:34 ` Hou Tao
2022-08-06 7:40 ` [PATCH bpf 6/9] bpf: Only allow sleepable program for resched-able iterator Hou Tao
2022-08-08 15:07 ` Yonghong Song
2022-08-06 7:40 ` [PATCH bpf 7/9] selftests/bpf: Add tests for reading a dangling map iter fd Hou Tao
2022-08-08 15:15 ` Yonghong Song
2022-08-09 1:23 ` houtao
2022-08-09 19:13 ` Martin KaFai Lau
2022-08-10 0:18 ` Yonghong Song
2022-08-06 7:40 ` [PATCH bpf 8/9] selftests/bpf: Add write tests for sk storage map iterator Hou Tao
2022-08-08 15:27 ` Yonghong Song
2022-08-09 1:26 ` houtao
2022-08-06 7:40 ` [PATCH bpf 9/9] selftests/bpf: Ensure sleepable program is rejected by hash map iter Hou Tao
2022-08-08 15:30 ` Yonghong Song
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220809184602.equlp2thcs2j4774@kafai-mbp \
--to=kafai@fb.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=haoluo@google.com \
--cc=houtao1@huawei.com \
--cc=houtao@huaweicloud.com \
--cc=john.fastabend@gmail.com \
--cc=jolsa@kernel.org \
--cc=kpsingh@kernel.org \
--cc=kuba@kernel.org \
--cc=lmb@cloudflare.com \
--cc=sdf@google.com \
--cc=songliubraving@fb.com \
--cc=yhs@fb.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox