commit 620f6e8e855d6d447688a5f67a4e176944a084e8
author Kees Cook <keescook@chromium.org> Wed Apr 04 11:40:19 2012 -0700
committer James Morris <james.l.morris@oracle.com> Thu Apr 05 14:51:43 2012 +1000
tree 2be8f032eefc0d3bdaf9a045bd9263da4a2c6823
parent 6c216ec636f75d834461be15f83ec41a6759bd2b

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>