diff --git a/0001-kmsg-Honor-dmesg_restrict-sysctl-on-dev-kmsg.patch b/0001-kmsg-Honor-dmesg_restrict-sysctl-on-dev-kmsg.patch new file mode 100644 index 0000000..acaf5f8 --- /dev/null +++ b/0001-kmsg-Honor-dmesg_restrict-sysctl-on-dev-kmsg.patch @@ -0,0 +1,46 @@ +From feaf4959c30d0640093a607c577940d3e9351076 Mon Sep 17 00:00:00 2001 +From: Josh Boyer +Date: Fri, 22 Feb 2013 11:47:37 -0500 +Subject: [PATCH] kmsg: Honor dmesg_restrict sysctl on /dev/kmsg + +Originally, the addition of the dmesg_restrict covered both the syslog +method of accessing dmesg, as well as /dev/kmsg itself. This was done +indirectly by security_syslog calling cap_syslog before doing any LSM +checks. + +However, commit 12b3052c3ee (capabilities/syslog: open code cap_syslog +logic to fix build failure) moved the code around and pushed the checks +into the caller itself. That seems to have inadvertently dropped the +checks for dmesg_restrict on /dev/kmsg. Most people haven't noticed +because util-linux dmesg(1) defaults to using the syslog method for +access in older versions. With util-linux 2.22 and a kernel newer than +3.5, dmesg(1) defaults to reading directly from /dev/kmsg. + +Fix this by making an explicit check in the devkmsg_open function. + +This fixes https://bugzilla.redhat.com/show_bug.cgi?id=903192 + +Reported-by: Christian Kujau +CC: stable@vger.kernel.org +Signed-off-by: Josh Boyer +--- + kernel/printk.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/kernel/printk.c b/kernel/printk.c +index f24633a..398ef9a 100644 +--- a/kernel/printk.c ++++ b/kernel/printk.c +@@ -615,6 +615,9 @@ static int devkmsg_open(struct inode *inode, struct file *file) + struct devkmsg_user *user; + int err; + ++ if (dmesg_restrict && !capable(CAP_SYSLOG)) ++ return -EACCES; ++ + /* write-only does not need any file context */ + if ((file->f_flags & O_ACCMODE) == O_WRONLY) + return 0; +-- +1.8.1.2 + diff --git a/kernel.spec b/kernel.spec index a44a59c..22713df 100644 --- a/kernel.spec +++ b/kernel.spec @@ -62,7 +62,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be appended after the rcX and # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # -%global baserelease 205 +%global baserelease 206 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -808,6 +808,9 @@ Patch22259: Bluetooth-Add-support-for-Foxconn-Hon-Hai-0489-e056.patch #CVE-2013-1763 rhbz 915052,915057 Patch22260: sock_diag-Fix-out-of-bounds-access-to-sock_diag_handlers.patch +#rhbz 903192 +Patch22261: 0001-kmsg-Honor-dmesg_restrict-sysctl-on-dev-kmsg.patch + Patch23000: silence-brcmsmac-warning.patch #rhbz 812111 @@ -1565,6 +1568,9 @@ ApplyPatch Bluetooth-Add-support-for-Foxconn-Hon-Hai-0489-e056.patch #CVE-2013-1763 rhbz 915052,915057 ApplyPatch sock_diag-Fix-out-of-bounds-access-to-sock_diag_handlers.patch +#rhbz 903192 +ApplyPatch 0001-kmsg-Honor-dmesg_restrict-sysctl-on-dev-kmsg.patch + # END OF PATCH APPLICATIONS %endif @@ -2428,6 +2434,9 @@ fi # ||----w | # || || %changelog +* Mon Feb 25 2013 Josh Boyer +- Honor dmesg_restrict for /dev/kmsg (rhbz 903192) + * Sun Feb 24 2013 Josh Boyer - 3.7.9-205 - CVE-2013-1763 sock_diag: out-of-bounds access to sock_diag_handlers (rhbz 915052,915057)