From: "Daniel Xu" <dxu@dxuuu.xyz>
To: "Daniel Borkmann" <daniel@iogearbox.net>, <bpf@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <ast@kernel.org>
Cc: <kernel-team@fb.com>
Subject: Re: [PATCH bpf-next] lib/strncpy_from_user.c: Don't overcopy bytes after NUL terminator
Date: Wed, 04 Nov 2020 12:18:49 -0800 [thread overview]
Message-ID: <C6UR9QUUYXKW.3PHSMQ3EXUYI3@maharaja> (raw)
In-Reply-To: <7831c092-5ab4-033e-8fb3-ad9702332d79@iogearbox.net>
Hi Daniel,
On Wed Nov 4, 2020 at 8:24 AM PST, Daniel Borkmann wrote:
> On 11/4/20 3:29 AM, Daniel Xu wrote:
> > do_strncpy_from_user() may copy some extra bytes after the NUL
> > terminator into the destination buffer. This usually does not matter for
> > normal string operations. However, when BPF programs key BPF maps with
> > strings, this matters a lot.
> >
> > A BPF program may read strings from user memory by calling the
> > bpf_probe_read_user_str() helper which eventually calls
> > do_strncpy_from_user(). The program can then key a map with the
> > resulting string. BPF map keys are fixed-width and string-agnostic,
> > meaning that map keys are treated as a set of bytes.
> >
> > The issue is when do_strncpy_from_user() overcopies bytes after the NUL
> > terminator, it can result in seemingly identical strings occupying
> > multiple slots in a BPF map. This behavior is subtle and totally
> > unexpected by the user.
> >
> > This commit uses the proper word-at-a-time APIs to avoid overcopying.
> >
> > Signed-off-by: Daniel Xu <dxu@dxuuu.xyz>
>
> It looks like this is a regression from the recent refactoring of the
> mem probing
> util functions?
I think it was like this from the beginning, at 6ae08ae3dea2 ("bpf: Add
probe_read_{user, kernel} and probe_read_{user, kernel}_str helpers").
The old bpf_probe_read_str() used the kernel's byte-by-byte copying
routine. bpf_probe_read_user_str() started using strncpy_from_user()
which has been doing the long-sized strides since ~2012 or earlier.
I tried to build and test the kernel at that commit but it seems my
compiler is too new to build that old code. Bunch of build failures.
I assume the refactor you're referring to is 8d92db5c04d1 ("bpf: rework
the compat kernel probe handling").
> Could we add a Fixes tag and then we'd also need to target the fix
> against bpf tree instead of bpf-next, no?
Sure, will do in v2.
>
> Moreover, a BPF kselftest would help to make sure it doesn't regress in
> future again.
Ditto.
[..]
Thanks,
Daniel
next prev parent reply other threads:[~2020-11-04 20:31 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-04 2:29 [PATCH bpf-next] lib/strncpy_from_user.c: Don't overcopy bytes after NUL terminator Daniel Xu
2020-11-04 16:24 ` Daniel Borkmann
2020-11-04 20:18 ` Daniel Xu [this message]
2020-11-04 22:36 ` Daniel Borkmann
2020-11-05 2:21 ` Daniel Xu
[not found] ` <20201106020930.GA18349@xsang-OptiPlex-9020>
2020-11-06 4:32 ` [lib/strncpy_from_user.c] 00a4ef91e8: BUG:KASAN:slab-out-of-bounds_in_s Alexei Starovoitov
2020-11-06 18:54 ` Daniel Xu
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=C6UR9QUUYXKW.3PHSMQ3EXUYI3@maharaja \
--to=dxu@dxuuu.xyz \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=kernel-team@fb.com \
--cc=linux-kernel@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).