rpms
/
kernel
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Honor dmesg_restrict for /dev/kmsg (rhbz 903192)

This commit is contained in:
Josh Boyer 2013-02-25 10:00:31 -05:00
parent 375c9e59f5
commit 48b6f5c693
2 changed files with 56 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
0001-kmsg-Honor-dmesg_restrict-sysctl-on-dev-kmsg.patch Normal file
View File

@ -0,0 +1,46 @@
From feaf4959c30d0640093a607c577940d3e9351076 Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@redhat.com>
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 <lists@nerdbynature.de>
CC: stable@vger.kernel.org
Signed-off-by: Josh Boyer <jwboyer@redhat.com>
---
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

11
kernel.spec
View File

@ -54,7 +54,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 104
%global baserelease 105
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@ -776,6 +776,9 @@ Patch22258: perf-hists-Fix-period-symbol_conf.field_sep-display.patch
#CVE-2013-1763 rhbz 915052,915057
Patch22259: 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
@ -1507,6 +1510,9 @@ ApplyPatch alps-v2-3.7.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
@ -2362,6 +2368,9 @@ fi
# '-' | |
# '-'
%changelog
* Mon Feb 25 2013 Josh Boyer <jwboyer@redhat.com>
- Honor dmesg_restrict for /dev/kmsg (rhbz 903192)
* Sun Feb 24 2013 Josh Boyer <jwboyer@redhat.com> - 3.7.9-104
- CVE-2013-1763 sock_diag: out-of-bounds access to sock_diag_handlers (rhbz 915052,915057)