From: Song Liu <songliubraving@fb.com>
To: Daniel Xu <dxu@dxuuu.xyz>
Cc: bpf <bpf@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"ast@kernel.org" <ast@kernel.org>,
"daniel@iogearbox.net" <daniel@iogearbox.net>,
Kernel Team <Kernel-team@fb.com>
Subject: Re: [PATCH bpf v2 1/2] lib/strncpy_from_user.c: Don't overcopy bytes after NUL terminator
Date: Thu, 5 Nov 2020 18:18:43 +0000 [thread overview]
Message-ID: <7DA54E81-F1FD-4CF7-946A-5B629B56C4A5@fb.com> (raw)
In-Reply-To: <CE6BCF1F-2112-40DC-87C8-91FA2D6C86FC@fb.com>
> On Nov 5, 2020, at 10:16 AM, Song Liu <songliubraving@fb.com> wrote:
>
>
>
>> On Nov 4, 2020, at 6:25 PM, Daniel Xu <dxu@dxuuu.xyz> wrote:
>>
>> do_strncpy_from_user() may copy some extra bytes after the NUL
>
> We have multiple use of "NUL" here, should be "NULL"?
Just realized strncpy_from_user.c uses "NUL", so nevermind...
>
>> 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.
>>
>> Fixes: 6ae08ae3dea2 ("bpf: Add probe_read_{user, kernel} and probe_read_{user, kernel}_str helpers")
>> Signed-off-by: Daniel Xu <dxu@dxuuu.xyz>
>> ---
>> lib/strncpy_from_user.c | 9 +++++++--
>> 1 file changed, 7 insertions(+), 2 deletions(-)
>>
>> diff --git a/lib/strncpy_from_user.c b/lib/strncpy_from_user.c
>> index e6d5fcc2cdf3..d084189eb05c 100644
>> --- a/lib/strncpy_from_user.c
>> +++ b/lib/strncpy_from_user.c
>> @@ -35,17 +35,22 @@ static inline long do_strncpy_from_user(char *dst, const char __user *src,
>> goto byte_at_a_time;
>>
>> while (max >= sizeof(unsigned long)) {
>> - unsigned long c, data;
>> + unsigned long c, data, mask, *out;
>>
>> /* Fall back to byte-at-a-time if we get a page fault */
>> unsafe_get_user(c, (unsigned long __user *)(src+res), byte_at_a_time);
>>
>> - *(unsigned long *)(dst+res) = c;
>> if (has_zero(c, &data, &constants)) {
>> data = prep_zero_mask(c, data, &constants);
>> data = create_zero_mask(data);
>> + mask = zero_bytemask(data);
>> + out = (unsigned long *)(dst+res);
>> + *out = (*out & ~mask) | (c & mask);
>> return res + find_zero(data);
>> + } else {
>
> This else clause is not needed, as we return in the if clause.
>
>> + *(unsigned long *)(dst+res) = c;
>> }
>> +
>> res += sizeof(unsigned long);
>> max -= sizeof(unsigned long);
>> }
>> --
>> 2.28.0
next prev parent reply other threads:[~2020-11-05 18:19 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-05 2:25 [PATCH bpf v2 0/2] Fix bpf_probe_read_user_str() overcopying Daniel Xu
2020-11-05 2:25 ` [PATCH bpf v2 1/2] lib/strncpy_from_user.c: Don't overcopy bytes after NUL terminator Daniel Xu
2020-11-05 9:00 ` David Laight
2020-11-05 18:16 ` Song Liu
2020-11-05 18:18 ` Song Liu [this message]
2020-11-05 19:28 ` Daniel Xu
2020-11-05 2:25 ` [PATCH bpf v2 2/2] selftest/bpf: Test bpf_probe_read_user_str() strips trailing bytes after NUL Daniel Xu
2020-11-05 18:30 ` Song Liu
2020-11-05 19:27 ` Daniel Xu
2020-11-05 21:32 ` Andrii Nakryiko
2020-11-05 23:22 ` Daniel Xu
2020-11-05 23:31 ` Song Liu
2020-11-05 23:55 ` 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=7DA54E81-F1FD-4CF7-946A-5B629B56C4A5@fb.com \
--to=songliubraving@fb.com \
--cc=Kernel-team@fb.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=dxu@dxuuu.xyz \
--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).