]> git.ipfire.org Git - people/ms/linux.git/commit
x86, smap: smap_violation() is bogus if CONFIG_X86_SMAP is off
authorH. Peter Anvin <hpa@linux.intel.com>
Thu, 13 Feb 2014 15:46:04 +0000 (07:46 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 22 Feb 2014 21:34:52 +0000 (13:34 -0800)
commit7f13e1f37bebd8aadf292e37fb1a3fdc680c827c
tree0a5942dbeccd38a5a15e24c588e351e62e374ca4
parent7eecce178e68a46923f5f9cb0a273b35f4bdedb9
x86, smap: smap_violation() is bogus if CONFIG_X86_SMAP is off

commit 4640c7ee9b8953237d05a61ea3ea93981d1bc961 upstream.

If CONFIG_X86_SMAP is disabled, smap_violation() tests for conditions
which are incorrect (as the AC flag doesn't matter), causing spurious
faults.

The dynamic disabling of SMAP (nosmap on the command line) is fine
because it disables X86_FEATURE_SMAP, therefore causing the
static_cpu_has() to return false.

Found by Fengguang Wu's test system.

[ v3: move all predicates into smap_violation() ]
[ v2: use IS_ENABLED() instead of #ifdef ]

Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Link: http://lkml.kernel.org/r/20140213124550.GA30497@localhost
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/x86/mm/fault.c