From: Alban Crequy <albancrequy@linux.microsoft.com>
To: Yonghong Song <yhs@meta.com>
Cc: Francis Laniel <flaniel@linux.microsoft.com>,
linux-kernel@vger.kernel.org,
Alban Crequy <alban.crequy@gmail.com>,
Alban Crequy <albancrequy@microsoft.com>,
Andrew Morton <akpm@linux-foundation.org>,
Andrii Nakryiko <andrii@kernel.org>,
Mykola Lysenko <mykolal@fb.com>,
Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Martin KaFai Lau <martin.lau@linux.dev>,
Song Liu <song@kernel.org>, Yonghong Song <yhs@fb.com>,
John Fastabend <john.fastabend@gmail.com>,
KP Singh <kpsingh@kernel.org>,
Stanislav Fomichev <sdf@google.com>, Hao Luo <haoluo@google.com>,
Jiri Olsa <jolsa@kernel.org>, Shuah Khan <shuah@kernel.org>,
linux-mm@kvack.org, bpf@vger.kernel.org,
linux-kselftest@vger.kernel.org
Subject: Re: [RFC PATCH v1 1/2] maccess: fix writing offset in case of fault in strncpy_from_kernel_nofault()
Date: Wed, 9 Nov 2022 12:23:38 +0100 [thread overview]
Message-ID: <20221109122338.7e931640@neptune> (raw)
In-Reply-To: <ab5a36cd-e9cc-074a-2fb6-858f5cc897e4@meta.com>
On Tue, 8 Nov 2022 12:38:53 -0800
Yonghong Song <yhs@meta.com> wrote:
> On 11/8/22 12:35 PM, Yonghong Song wrote:
> >
> >
> > On 11/8/22 11:52 AM, Francis Laniel wrote:
> >> From: Alban Crequy <albancrequy@microsoft.com>
> >>
> >> If a page fault occurs while copying the first byte, this function
> >> resets one
> >> byte before dst.
> >> As a consequence, an address could be modified and leaded to
> >> kernel crashes if
> >> case the modified address was accessed later.
> >>
> >> Signed-off-by: Alban Crequy <albancrequy@microsoft.com>
> >> Tested-by: Francis Laniel <flaniel@linux.microsoft.com>
> >> ---
> >> mm/maccess.c | 2 +-
> >> 1 file changed, 1 insertion(+), 1 deletion(-)
> >>
> >> diff --git a/mm/maccess.c b/mm/maccess.c
> >> index 5f4d240f67ec..074f6b086671 100644
> >> --- a/mm/maccess.c
> >> +++ b/mm/maccess.c
> >> @@ -97,7 +97,7 @@ long strncpy_from_kernel_nofault(char *dst,
> >> const void *unsafe_addr, long count)
> >> return src - unsafe_addr;
> >> Efault:
> >> pagefault_enable();
> >> - dst[-1] = '\0';
> >> + dst[0] = '\0';
> >
> > What if the fault is due to dst, so the above won't work, right?
> >
> > The original code should work fine if the first byte copy is
> > successful. For the first byte copy fault, maybe just to leave it
> > as is?
>
> Okay, the dst is always safe (from func signature), so change looks
> okay to me. Probably mm people can double check.
My understanding was that the bpf verifier is supposed to check that the
dst pointer is safe. But I don't know where it is done, and I don't
know how it can check that the dst buffer is big enough.
> >
> >> return -EFAULT;
> >> }
> >>
> >> --
> >> 2.25.1
> >>
>
next prev parent reply other threads:[~2022-11-09 11:26 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-08 19:52 [RFC PATCH v1 0/2] Fix offset when fault occurs " Francis Laniel
2022-11-08 19:52 ` [RFC PATCH v1 1/2] maccess: fix writing offset in case of fault " Francis Laniel
2022-11-08 20:35 ` Yonghong Song
2022-11-08 20:38 ` Yonghong Song
2022-11-09 11:23 ` Alban Crequy [this message]
2022-11-09 16:09 ` Yonghong Song
2022-11-08 21:05 ` Andrew Morton
2022-11-08 19:52 ` [RFC PATCH v1 2/2] selftests: bpf: add a test when bpf_probe_read_kernel_str() returns EFAULT Francis Laniel
2022-11-08 22:06 ` 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=20221109122338.7e931640@neptune \
--to=albancrequy@linux.microsoft.com \
--cc=akpm@linux-foundation.org \
--cc=alban.crequy@gmail.com \
--cc=albancrequy@microsoft.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=flaniel@linux.microsoft.com \
--cc=haoluo@google.com \
--cc=john.fastabend@gmail.com \
--cc=jolsa@kernel.org \
--cc=kpsingh@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=martin.lau@linux.dev \
--cc=mykolal@fb.com \
--cc=sdf@google.com \
--cc=shuah@kernel.org \
--cc=song@kernel.org \
--cc=yhs@fb.com \
--cc=yhs@meta.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