diff options
author | Kees Cook <keescook@chromium.org> | 2012-04-04 20:40:19 +0200 |
---|---|---|
committer | James Morris <james.l.morris@oracle.com> | 2012-04-05 06:51:43 +0200 |
commit | 620f6e8e855d6d447688a5f67a4e176944a084e8 (patch) | |
tree | 2be8f032eefc0d3bdaf9a045bd9263da4a2c6823 /kernel/trace/trace_event_perf.c | |
parent | Merge tag 'for_linus-3.4-rc2' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
download | linux-620f6e8e855d6d447688a5f67a4e176944a084e8.tar.xz linux-620f6e8e855d6d447688a5f67a4e176944a084e8.zip |
sysctl: fix write access to dmesg_restrict/kptr_restrict
Commit bfdc0b4 adds code to restrict access to dmesg_restrict,
however, it incorrectly alters kptr_restrict rather than
dmesg_restrict.
The original patch from Richard Weinberger
(https://lkml.org/lkml/2011/3/14/362) alters dmesg_restrict as
expected, and so the patch seems to have been misapplied.
This adds the CAP_SYS_ADMIN check to both dmesg_restrict and
kptr_restrict, since both are sensitive.
Reported-by: Phillip Lougher <plougher@redhat.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Acked-by: Richard Weinberger <richard@nod.at>
Cc: stable@vger.kernel.org
Signed-off-by: James Morris <james.l.morris@oracle.com>
Diffstat (limited to 'kernel/trace/trace_event_perf.c')
0 files changed, 0 insertions, 0 deletions