From: Martin KaFai Lau <martin.lau@linux.dev>
To: Weiming Shi <bestswngs@gmail.com>
Cc: "David S . Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>,
Paolo Abeni <pabeni@redhat.com>, Simon Horman <horms@kernel.org>,
Martin KaFai Lau <martin.lau@kernel.org>,
Alexei Starovoitov <ast@kernel.org>,
Amery Hung <ameryhung@gmail.com>,
Leon Hwang <leon.hwang@linux.dev>, Kees Cook <kees@kernel.org>,
Fushuai Wang <wangfushuai@baidu.com>,
Menglong Dong <menglong8.dong@gmail.com>,
netdev@vger.kernel.org, bpf@vger.kernel.org,
Xiang Mei <xmei5@asu.edu>
Subject: Re: [PATCH bpf v3] bpf: Fix NULL pointer dereference in bpf_sk_storage_clone and diag paths
Date: Thu, 23 Apr 2026 17:41:56 -0700 [thread overview]
Message-ID: <202642403529.Rc5t.martin.lau@linux.dev> (raw)
In-Reply-To: <20260422065411.1007737-2-bestswngs@gmail.com>
On Tue, Apr 21, 2026 at 11:54:12PM -0700, Weiming Shi wrote:
> @@ -668,7 +670,11 @@ int bpf_sk_storage_diag_put(struct bpf_sk_storage_diag *diag,
>
> diag_size += nla_value_size(diag->maps[i]->value_size);
This is the same issue pointed out as v1. diag_size is updated with
a smap in diag->maps[i]...
>
> - if (nla_stgs && diag_get(sdata, skb))
> + smap = rcu_dereference(sdata->smap);
> + if (!smap)
> + continue;
... and then nothing is stored in skb, so diag_size is incorrectly inflated.
> +
> + if (nla_stgs && diag_get(smap, sdata, skb))
diag->maps[i] can be directly used here. I fixed it up before applying.
> /* Continue to learn diag_size */
> err = -EMSGSIZE;
> }
> --
> 2.43.0
>
next prev parent reply other threads:[~2026-04-24 0:42 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-22 6:54 [PATCH bpf v3] bpf: Fix NULL pointer dereference in bpf_sk_storage_clone and diag paths Weiming Shi
2026-04-23 21:40 ` Amery Hung
2026-04-24 0:41 ` Martin KaFai Lau [this message]
2026-04-24 3:40 ` patchwork-bot+netdevbpf
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=202642403529.Rc5t.martin.lau@linux.dev \
--to=martin.lau@linux.dev \
--cc=ameryhung@gmail.com \
--cc=ast@kernel.org \
--cc=bestswngs@gmail.com \
--cc=bpf@vger.kernel.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=horms@kernel.org \
--cc=kees@kernel.org \
--cc=kuba@kernel.org \
--cc=leon.hwang@linux.dev \
--cc=martin.lau@kernel.org \
--cc=menglong8.dong@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=wangfushuai@baidu.com \
--cc=xmei5@asu.edu \
/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