sysctl: fix write access to dmesg_restrict/kptr_restrict
authorKees Cook <keescook@chromium.org>
Wed, 4 Apr 2012 18:40:19 +0000 (11:40 -0700)
committerLuis Henriques <luis.henriques@canonical.com>
Mon, 30 Apr 2012 18:15:03 +0000 (19:15 +0100)
commit1c44ae9800333527baf977e2e5382fd9bcf270d6
treeb40c929b3069e9643db06eed2fc7378cb297a93f
parent3acdf8fba1b974c659fcc76fc09e81f57a1ea06d
sysctl: fix write access to dmesg_restrict/kptr_restrict

BugLink: http://bugs.launchpad.net/bugs/981162

commit 620f6e8e855d6d447688a5f67a4e176944a084e8 upstream.

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>
Signed-off-by: James Morris <james.l.morris@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
kernel/sysctl.c