From: Peter Zijlstra <peterz@infradead.org>
To: lkp@lists.01.org
Subject: Re: [uaccess] 780464aed0: WARNING:at_arch/x86/include/asm/uaccess.h:#strnlen_user/0x
Date: Tue, 05 Mar 2019 10:07:29 +0100 [thread overview]
Message-ID: <20190305090729.GF32477@hirez.programming.kicks-ass.net> (raw)
In-Reply-To: <20190305113635.18f80ea3b1f4fca54b9d21e4@kernel.org>
[-- Attachment #1: Type: text/plain, Size: 1554 bytes --]
On Tue, Mar 05, 2019 at 11:36:35AM +0900, Masami Hiramatsu wrote:
> I think the better way to do this is allowing strncpy_from_user()
O
> if some conditions are match, like
>
> - strncpy_from_user() will be able to copy user memory with set_fs(USER_DS)
> - strncpy_from_user() can copy kernel memory with set_fs(KERNEL_DS)
> - strncpy_from_user() can access unsafe memory in IRQ context if
> pagefault is disabled.
>
> This is almost done, except for CONFIG_DEBUG_ATOMIC_SLEEP=y on x86.
>
> So, what about adding a condition to WARN_ON_IN_IRQ() like below
> instead of introducing user_access_ok() ?
>
> diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h
> index 780f2b42c8ef..ec0f0b74c9ab 100644
> --- a/arch/x86/include/asm/uaccess.h
> +++ b/arch/x86/include/asm/uaccess.h
> @@ -70,7 +70,7 @@ static inline bool __chk_range_not_ok(unsigned long addr, unsigned long size, un
> })
>
> #ifdef CONFIG_DEBUG_ATOMIC_SLEEP
> -# define WARN_ON_IN_IRQ() WARN_ON_ONCE(!in_task())
> +# define WARN_ON_IN_IRQ() WARN_ON_ONCE(pagefault_disabled() && !in_task())
That doesn't make any kind of sense to me; see faulthandler_disabled().
IOW. interrupt (and any atomic context really) won't take faults anyway.
I dislike that whole KERNEL_DS thing, but obviously that's not something
that's going away.
Would something like:
WARN_ON_ONCE(!(in_task || segment_eq(get_fs(), USER_DS)))
Work? Then we allow KERNEL_DS in task context, but for interrupt and
others require USER_DS.
WARNING: multiple messages have this Message-ID (diff)
From: Peter Zijlstra <peterz@infradead.org>
To: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
kernel test robot <lkp@intel.com>,
Steven Rostedt <rostedt@goodmis.org>,
Shuah Khan <shuah@kernel.org>,
Linux List Kernel Mailing <linux-kernel@vger.kernel.org>,
Andy Lutomirski <luto@amacapital.net>,
Ingo Molnar <mingo@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
Changbin Du <changbin.du@gmail.com>, Jann Horn <jannh@google.com>,
Kees Cook <keescook@chromium.org>,
Andy Lutomirski <luto@kernel.org>,
Alexei Starovoitov <alexei.starovoitov@gmail.com>,
Nadav Amit <namit@vmware.com>,
Joel Fernandes <joel@joelfernandes.org>,
yhs@fb.com, lkp@01.org
Subject: Re: [uaccess] 780464aed0: WARNING:at_arch/x86/include/asm/uaccess.h:#strnlen_user/0x
Date: Tue, 5 Mar 2019 10:07:29 +0100 [thread overview]
Message-ID: <20190305090729.GF32477@hirez.programming.kicks-ass.net> (raw)
In-Reply-To: <20190305113635.18f80ea3b1f4fca54b9d21e4@kernel.org>
On Tue, Mar 05, 2019 at 11:36:35AM +0900, Masami Hiramatsu wrote:
> I think the better way to do this is allowing strncpy_from_user()
O
> if some conditions are match, like
>
> - strncpy_from_user() will be able to copy user memory with set_fs(USER_DS)
> - strncpy_from_user() can copy kernel memory with set_fs(KERNEL_DS)
> - strncpy_from_user() can access unsafe memory in IRQ context if
> pagefault is disabled.
>
> This is almost done, except for CONFIG_DEBUG_ATOMIC_SLEEP=y on x86.
>
> So, what about adding a condition to WARN_ON_IN_IRQ() like below
> instead of introducing user_access_ok() ?
>
> diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h
> index 780f2b42c8ef..ec0f0b74c9ab 100644
> --- a/arch/x86/include/asm/uaccess.h
> +++ b/arch/x86/include/asm/uaccess.h
> @@ -70,7 +70,7 @@ static inline bool __chk_range_not_ok(unsigned long addr, unsigned long size, un
> })
>
> #ifdef CONFIG_DEBUG_ATOMIC_SLEEP
> -# define WARN_ON_IN_IRQ() WARN_ON_ONCE(!in_task())
> +# define WARN_ON_IN_IRQ() WARN_ON_ONCE(pagefault_disabled() && !in_task())
That doesn't make any kind of sense to me; see faulthandler_disabled().
IOW. interrupt (and any atomic context really) won't take faults anyway.
I dislike that whole KERNEL_DS thing, but obviously that's not something
that's going away.
Would something like:
WARN_ON_ONCE(!(in_task || segment_eq(get_fs(), USER_DS)))
Work? Then we allow KERNEL_DS in task context, but for interrupt and
others require USER_DS.
next prev parent reply other threads:[~2019-03-05 9:07 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-28 16:02 [PATCH v5 0/6] tracing/probes: uaccess: Add support user-space access Masami Hiramatsu
2019-02-28 16:02 ` [PATCH v5 1/6] uaccess: Add user_access_ok() Masami Hiramatsu
2019-02-28 16:03 ` [PATCH v5 2/6] uaccess: Use user_access_ok() in user_access_begin() Masami Hiramatsu
2019-03-03 17:39 ` [uaccess] 780464aed0: WARNING:at_arch/x86/include/asm/uaccess.h:#strnlen_user/0x kernel test robot
2019-03-03 17:39 ` kernel test robot
2019-03-03 19:53 ` Linus Torvalds
2019-03-03 19:53 ` Linus Torvalds
2019-03-04 1:14 ` Masami Hiramatsu
2019-03-04 1:14 ` Masami Hiramatsu
2019-03-04 2:37 ` Linus Torvalds
2019-03-04 2:37 ` Linus Torvalds
2019-03-04 9:06 ` Masami Hiramatsu
2019-03-04 9:06 ` Masami Hiramatsu
2019-03-04 15:16 ` Masami Hiramatsu
2019-03-04 15:16 ` Masami Hiramatsu
2019-03-04 15:58 ` Jann Horn
2019-03-04 15:58 ` Jann Horn
2019-03-04 18:59 ` Linus Torvalds
2019-03-04 18:59 ` Linus Torvalds
2019-03-05 2:36 ` Masami Hiramatsu
2019-03-05 2:36 ` Masami Hiramatsu
2019-03-05 8:22 ` Masami Hiramatsu
2019-03-05 8:22 ` Masami Hiramatsu
2019-03-05 9:01 ` Masami Hiramatsu
2019-03-05 9:01 ` Masami Hiramatsu
2019-03-05 9:07 ` Peter Zijlstra [this message]
2019-03-05 9:07 ` Peter Zijlstra
2019-03-05 13:58 ` Masami Hiramatsu
2019-03-05 13:58 ` Masami Hiramatsu
2019-03-05 14:53 ` Peter Zijlstra
2019-03-05 14:53 ` Peter Zijlstra
2019-03-05 15:18 ` Masami Hiramatsu
2019-03-05 15:18 ` Masami Hiramatsu
2019-03-04 3:20 ` Rong Chen
2019-03-04 3:20 ` [LKP] " Rong Chen
2019-02-28 16:03 ` [PATCH v5 3/6] uaccess: Add non-pagefault user-space read functions Masami Hiramatsu
2019-02-28 22:49 ` Yonghong Song
2019-03-01 2:29 ` Masami Hiramatsu
2019-03-01 6:30 ` Yonghong Song
2019-02-28 16:04 ` [PATCH v5 4/6] tracing/probe: Add ustring type for user-space string Masami Hiramatsu
2019-02-28 16:04 ` [PATCH v5 5/6] tracing/probe: Support user-space dereference Masami Hiramatsu
2019-02-28 16:05 ` [PATCH v5 6/6] selftests/ftrace: Add user-memory access syntax testcase Masami Hiramatsu
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=20190305090729.GF32477@hirez.programming.kicks-ass.net \
--to=peterz@infradead.org \
--cc=lkp@lists.01.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.