On Fri, Jun 03, 2016 at 03:58:09AM -0700, tip-bot for Peter Zijlstra wrote:
> Commit-ID: 25841ee0e9d2a1d952828138416701f20ea831eb
> Gitweb: http://git.kernel.org/tip/25841ee0e9d2a1d952828138416701f20ea831eb
> Author: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
> AuthorDate: Sun, 22 May 2016 12:48:27 +0200
> Committer: Ingo Molnar <mingo@xxxxxxxxxx>
> CommitDate: Fri, 3 Jun 2016 12:06:11 +0200
>
> locking/barriers: Validate lockless_dereference() is used on a pointer type
>
> Add a cast to void * to validate the argument @p is indeed a pointer.
>
> Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx>
> Cc: Alexey Dobriyan <adobriyan@xxxxxxxxx>
> Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
> Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
> Cc: Paul E. McKenney <paulmck@xxxxxxxxxxxxxxxxxx>
> Cc: Paul McKenney <paulmck@xxxxxxxxxxxxxxxxxx>
> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
> Link: http://lkml.kernel.org/r/20160522104827.GP3193@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
> Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
> ---
> include/linux/compiler.h | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/include/linux/compiler.h b/include/linux/compiler.h
> index 793c082..e9c6417 100644
> --- a/include/linux/compiler.h
> +++ b/include/linux/compiler.h
> @@ -545,9 +545,13 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
> * Similar to rcu_dereference(), but for situations where the pointed-to
> * object's lifetime is managed by something other than RCU. That
> * "something other" might be reference counting or simple immortality.
> + *
> + * The seemingly unused void * variable is to validate @p is indeed a pointer
> + * type. All pointer types silently cast to void *.
> */
> #define lockless_dereference(p) \
> ({ \
> + __maybe_unused const void * const _________p2 = p; \
> typeof(p) _________p1 = READ_ONCE(p); \
> smp_read_barrier_depends(); /* Dependency order vs. p above. */ \
> (_________p1); \
This causes issues, e.g.:
BUG: KASAN: user-memory-access on address 000060ff95001931^M
Read of size 1 by task NetworkManager/897^M
CPU: 1 PID: 897 Comm: NetworkManager Not tainted 4.7.0-rc1dupa+ #355^M
Hardware name: Bochs Bochs, BIOS Bochs 01/01/2011^M
ffff88003a1f8040 0000000017d08b23 ffff880033aff4b0 ffffffff8187b2f8^M
ffff88005b44f2c8 ffff880033aff548 ffff880033aff538 ffffffff813506a6^M
ffffffff81167e5esystemd[1]: sshd.service: Forked /usr/sbin/sshd as 904^M
^M
ffffed000675fe9d 0000000000000286 ffff880033aff588^M
Call Trace:^M
[<ffffffff8187b2f8>] dump_stack+0x85/0xcd^M
[<ffffffff813506a6>] kasan_report_error+0x456/0x560^M
[<ffffffff81167e5e>] ? vprintk_default+0x3e/0x60^M
[<ffffffff812a19e3>] ? printk+0xa8/0xd8^M
[<ffffffff812a193b>] ? power_down+0xa9/0xa9^M
[<ffffffff81350d48>] kasan_report+0x58/0x60^M
[<ffffffff81e84fe5>] ? leaf_walk_rcu+0x235/0x2d0^M
[<ffffffff8134f447>] __asan_load1+0x47/0x50^M
[<ffffffff81e84fe5>] leaf_walk_rcu+0x235/0x2d0^M
[snip]
The reason is that leaf_walk_rcu does get_child_rcu(pn, cindex++), which
ends up in lockless_dereference as pn[cindex++], which is now evaluated
twice.
The simplest fix I see does the assignment later, that is:
diff --git a/include/linux/compiler.h b/include/linux/compiler.h
index e9c6417..06f27fd 100644
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@ -551,8 +551,8 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
*/
#define lockless_dereference(p) \
({ \
- __maybe_unused const void * const _________p2 = p; \
typeof(p) _________p1 = READ_ONCE(p); \
+ __maybe_unused const void * const _________p2 = _________p1; \
smp_read_barrier_depends(); /* Dependency order vs. p above. */ \
(_________p1); \
})
--
Mateusz Guzik
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|