Skip to contentSkip to conversation

syslog: check cap_syslog when dmesg_restrict

PATCH Applied Serge E. Hallyn 5 participants 7 messages Dec 8, 2010 – Dec 10, 2010 Documentation

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 syslog: check cap_syslog when dmesg_restrict

Eric Paris pointed out that it doesn't make sense to require both CAP_SYS_ADMIN and CAP_SYSLOG for certain syslog actions. So require CAP_SYSLOG, not CAP_SYS_ADMIN, when dmesg_restrict is set.

(I'm also consolidating the now common error path)

---
 Documentation/sysctl/kernel.txt |    2 +-
 kernel/printk.c                 |   20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)
Documentation/sysctl/kernel.txt +1 -1
index 209e158..5740671 100644
@@ -219,7 +219,7 @@ dmesg_restrict:
 This toggle indicates whether unprivileged users are prevented from using
 dmesg(8) to view messages from the kernel's log buffer.  When
 dmesg_restrict is set to (0) there are no restrictions.  When
-dmesg_restrict is set set to (1), users must have CAP_SYS_ADMIN to use
+dmesg_restrict is set set to (1), users must have CAP_SYSLOG to use
 dmesg(8).
 
 The kernel config option CONFIG_SECURITY_DMESG_RESTRICT sets the default
kernel/printk.c +10 -10
index 0712380..0cecba0 100644
@@ -279,18 +279,12 @@ int do_syslog(int type, char __user *buf, int len, bool from_file)
 	 * at open time.
 	 */
 	if (type == SYSLOG_ACTION_OPEN || !from_file) {
-		if (dmesg_restrict && !capable(CAP_SYS_ADMIN))
-			return -EPERM;
+		if (dmesg_restrict && !capable(CAP_SYSLOG))
+			goto warn; /* switch to return -EPERM after 2.6.39 */
 		if ((type != SYSLOG_ACTION_READ_ALL &&
 		     type != SYSLOG_ACTION_SIZE_BUFFER) &&
-		    !capable(CAP_SYSLOG)) {
-			/* remove after 2.6.38 */
-			if (capable(CAP_SYS_ADMIN))
-				WARN_ONCE(1, "Attempt to access syslog with "
-				  "CAP_SYS_ADMIN but no CAP_SYSLOG "
-				  "(deprecated and denied).\n");
-			return -EPERM;
-		}
+		    !capable(CAP_SYSLOG))
+			goto warn; /* switch to return -EPERM after 2.6.39 */
 	}
 
 	error = security_syslog(type);
@@ -434,6 +428,12 @@ int do_syslog(int type, char __user *buf, int len, bool from_file)
 	}
 out:
 	return error;
+warn:
+	/* remove after 2.6.39 */
+	if (capable(CAP_SYS_ADMIN))
+		WARN_ONCE(1, "Attempt to access syslog with CAP_SYS_ADMIN "
+		  "but no CAP_SYSLOG (deprecated and denied).\n");
+	return -EPERM;
 }
 
 SYSCALL_DEFINE3(syslog, int, type, char __user *, buf, int, len)
Signature · 1 line
1.7.0.4
#1 lore raw
Quoted 40 lines · Serge E. Hallyn

Eric Paris pointed out that it doesn't make sense to require both CAP_SYS_ADMIN and CAP_SYSLOG for certain syslog actions. So require CAP_SYSLOG, not CAP_SYS_ADMIN, when dmesg_restrict is set.

(I'm also consolidating the now common error path)

---
 Documentation/sysctl/kernel.txt |    2 +-
 kernel/printk.c                 |   20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)
Documentation/sysctl/kernel.txt +1 -1
index 209e158..5740671 100644
@@ -219,7 +219,7 @@ dmesg_restrict:
 This toggle indicates whether unprivileged users are prevented from using
 dmesg(8) to view messages from the kernel's log buffer.  When
 dmesg_restrict is set to (0) there are no restrictions.  When
-dmesg_restrict is set set to (1), users must have CAP_SYS_ADMIN to use
+dmesg_restrict is set set to (1), users must have CAP_SYSLOG to use
 dmesg(8).
 
 The kernel config option CONFIG_SECURITY_DMESG_RESTRICT sets the default
kernel/printk.c +2 -2
index 0712380..0cecba0 100644
@@ -279,18 +279,12 @@ int do_syslog(int type, char __user *buf, int len, bool from_file)
 	 * at open time.
 	 */
 	if (type == SYSLOG_ACTION_OPEN || !from_file) {
-		if (dmesg_restrict && !capable(CAP_SYS_ADMIN))
-			return -EPERM;
+		if (dmesg_restrict && !capable(CAP_SYSLOG))
+			goto warn; /* switch to return -EPERM after 2.6.39 */
 		if ((type != SYSLOG_ACTION_READ_ALL &&
 		     type != SYSLOG_ACTION_SIZE_BUFFER) &&

kernel/printk.c int do_syslog(int type, char __user *buf, int len, bool from_file) · line 287

Quoted 10 lines
kernel/printk.c +2 -8
-		    !capable(CAP_SYSLOG)) {
-			/* remove after 2.6.38 */
-			if (capable(CAP_SYS_ADMIN))
-				WARN_ONCE(1, "Attempt to access syslog with "
-				  "CAP_SYS_ADMIN but no CAP_SYSLOG "
-				  "(deprecated and denied).\n");
-			return -EPERM;
-		}
+		    !capable(CAP_SYSLOG))
+			goto warn; /* switch to return -EPERM after 2.6.39 */

Doesn't this return -EPERM right now? I think the code might be incorrect today as well......

I thought the flow was supposed to be

if (capable(CAP_SYSLOG))
all good
else if (capable(CAP_SYS_ADMIN))
WARN, but still good for now
else
EPERM

But it looks to me like the flow is

if (capable(CAP_SYSLOG))
all good
else if (capable(CAP_SYS_ADMIN))
WARN, EPERM
else
EPERM

Quoted 16 lines
kernel/printk.c +6 -0
 	}
 
 	error = security_syslog(type);
@@ -434,6 +428,12 @@ int do_syslog(int type, char __user *buf, int len, bool from_file)
 	}
 out:
 	return error;
+warn:
+	/* remove after 2.6.39 */
+	if (capable(CAP_SYS_ADMIN))
+		WARN_ONCE(1, "Attempt to access syslog with CAP_SYS_ADMIN "
+		  "but no CAP_SYSLOG (deprecated and denied).\n");
+	return -EPERM;
 }
 
 SYSCALL_DEFINE3(syslog, int, type, char __user *, buf, int, len)
#2 lore raw
Quoted 2 lines · Eric Paris

On Wed, 2010-12-08 at 15:19 +0000, Serge E. Hallyn wrote:
Doesn't this return -EPERM right now?

Yes.

Quoted 9 lines

I think the code might be
incorrect today as well......

I thought the flow was supposed to be

if (capable(CAP_SYSLOG))
all good
else if (capable(CAP_SYS_ADMIN))
WARN, but still good for now

I prefer warn and deny. Otherwise it's too easy to ignore warnings. So I prefer the msg to be there to explain why it failed - not that I expect it to fail for anyone today.

Quoted 13 lines

else
EPERM

But it looks to me like the flow is

if (capable(CAP_SYSLOG))
all good
else if (capable(CAP_SYS_ADMIN))
WARN, EPERM
else
EPERM

Quoted 1 line

}

Yup.

-serge

Acked-by
#3 lore raw
Quoted 7 lines · Serge E. Hallyn
Quoted 5 lines · Eric Paris

I think the code might be
incorrect today as well......

I thought the flow was supposed to be

Quoted 8 lines
Quoted 4 lines

if (capable(CAP_SYSLOG))
all good
else if (capable(CAP_SYS_ADMIN))
WARN, but still good for now

I prefer warn and deny. Otherwise it's too easy to ignore warnings. So I prefer the msg to be there to explain why it failed - not that I expect it to fail for anyone today.

Ok, fine with me.

Acked-by on v1 1/1
#4 lore raw
In reply to Serge E. Hallyn
Quoted 8 lines · Serge E. Hallyn

Eric Paris pointed out that it doesn't make sense to require both CAP_SYS_ADMIN and CAP_SYSLOG for certain syslog actions. So require CAP_SYSLOG, not CAP_SYS_ADMIN, when dmesg_restrict is set.

(I'm also consolidating the now common error path)

Signature · 2 lines
Kees Cook
Ubuntu Security Team
Applied
#5 lore raw
In reply to Serge E. Hallyn
Quoted 8 lines · Serge E. Hallyn

Eric Paris pointed out that it doesn't make sense to require both CAP_SYS_ADMIN and CAP_SYSLOG for certain syslog actions. So require CAP_SYSLOG, not CAP_SYS_ADMIN, when dmesg_restrict is set.

(I'm also consolidating the now common error path)

Applied.

(Please cc the lsm list with security patches).

Quoted 61 lines
---
 Documentation/sysctl/kernel.txt |    2 +-
 kernel/printk.c                 |   20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)
Documentation/sysctl/kernel.txt +1 -1
index 209e158..5740671 100644
@@ -219,7 +219,7 @@ dmesg_restrict:
 This toggle indicates whether unprivileged users are prevented from using
 dmesg(8) to view messages from the kernel's log buffer.  When
 dmesg_restrict is set to (0) there are no restrictions.  When
-dmesg_restrict is set set to (1), users must have CAP_SYS_ADMIN to use
+dmesg_restrict is set set to (1), users must have CAP_SYSLOG to use
 dmesg(8).
 
 The kernel config option CONFIG_SECURITY_DMESG_RESTRICT sets the default
kernel/printk.c +10 -10
index 0712380..0cecba0 100644
@@ -279,18 +279,12 @@ int do_syslog(int type, char __user *buf, int len, bool from_file)
 	 * at open time.
 	 */
 	if (type == SYSLOG_ACTION_OPEN || !from_file) {
-		if (dmesg_restrict && !capable(CAP_SYS_ADMIN))
-			return -EPERM;
+		if (dmesg_restrict && !capable(CAP_SYSLOG))
+			goto warn; /* switch to return -EPERM after 2.6.39 */
 		if ((type != SYSLOG_ACTION_READ_ALL &&
 		     type != SYSLOG_ACTION_SIZE_BUFFER) &&
-		    !capable(CAP_SYSLOG)) {
-			/* remove after 2.6.38 */
-			if (capable(CAP_SYS_ADMIN))
-				WARN_ONCE(1, "Attempt to access syslog with "
-				  "CAP_SYS_ADMIN but no CAP_SYSLOG "
-				  "(deprecated and denied).\n");
-			return -EPERM;
-		}
+		    !capable(CAP_SYSLOG))
+			goto warn; /* switch to return -EPERM after 2.6.39 */
 	}
 
 	error = security_syslog(type);
@@ -434,6 +428,12 @@ int do_syslog(int type, char __user *buf, int len, bool from_file)
 	}
 out:
 	return error;
+warn:
+	/* remove after 2.6.39 */
+	if (capable(CAP_SYS_ADMIN))
+		WARN_ONCE(1, "Attempt to access syslog with CAP_SYS_ADMIN "
+		  "but no CAP_SYSLOG (deprecated and denied).\n");
+	return -EPERM;
 }
 
 SYSCALL_DEFINE3(syslog, int, type, char __user *, buf, int, len)
Signature · 1 line
1.7.0.4
Signature · 2 lines
James Morris
<[email protected]>
#6 lore raw

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 72 lines · James Morris
Quoted 8 lines · Serge E. Hallyn

Eric Paris pointed out that it doesn't make sense to require both CAP_SYS_ADMIN and CAP_SYSLOG for certain syslog actions. So require CAP_SYSLOG, not CAP_SYS_ADMIN, when dmesg_restrict is set.

(I'm also consolidating the now common error path)

Applied.

(Please cc the lsm list with security patches).

Quoted 57 lines
---
 Documentation/sysctl/kernel.txt |    2 +-
 kernel/printk.c                 |   20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)
Documentation/sysctl/kernel.txt +1 -1
index 209e158..5740671 100644
@@ -219,7 +219,7 @@ dmesg_restrict:
 This toggle indicates whether unprivileged users are prevented from using
 dmesg(8) to view messages from the kernel's log buffer.  When
 dmesg_restrict is set to (0) there are no restrictions.  When
-dmesg_restrict is set set to (1), users must have CAP_SYS_ADMIN to use
+dmesg_restrict is set set to (1), users must have CAP_SYSLOG to use
 dmesg(8).
 
 The kernel config option CONFIG_SECURITY_DMESG_RESTRICT sets the default
kernel/printk.c +10 -10
index 0712380..0cecba0 100644
@@ -279,18 +279,12 @@ int do_syslog(int type, char __user *buf, int len, bool from_file)
 	 * at open time.
 	 */
 	if (type == SYSLOG_ACTION_OPEN || !from_file) {
-		if (dmesg_restrict && !capable(CAP_SYS_ADMIN))
-			return -EPERM;
+		if (dmesg_restrict && !capable(CAP_SYSLOG))
+			goto warn; /* switch to return -EPERM after 2.6.39 */
 		if ((type != SYSLOG_ACTION_READ_ALL &&
 		     type != SYSLOG_ACTION_SIZE_BUFFER) &&
-		    !capable(CAP_SYSLOG)) {
-			/* remove after 2.6.38 */
-			if (capable(CAP_SYS_ADMIN))
-				WARN_ONCE(1, "Attempt to access syslog with "
-				  "CAP_SYS_ADMIN but no CAP_SYSLOG "
-				  "(deprecated and denied).\n");
-			return -EPERM;
-		}
+		    !capable(CAP_SYSLOG))
+			goto warn; /* switch to return -EPERM after 2.6.39 */
 	}
 
 	error = security_syslog(type);
@@ -434,6 +428,12 @@ int do_syslog(int type, char __user *buf, int len, bool from_file)
 	}
 out:
 	return error;
+warn:
+	/* remove after 2.6.39 */
+	if (capable(CAP_SYS_ADMIN))
+		WARN_ONCE(1, "Attempt to access syslog with CAP_SYS_ADMIN "
+		  "but no CAP_SYSLOG (deprecated and denied).\n");
+	return -EPERM;
 }
 
Quoted 5 lines
Quoted 4 lines
kernel/printk.c +0 -0
 SYSCALL_DEFINE3(syslog, int, type, char __user *, buf, int, len)
Signature · 1 line
1.7.0.4

Does anyone have an idea of which domains are going to be effected by this change?
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org/

iEYEARECAAYFAk0CMvcACgkQrlYvE4MpobP++gCgyJtjhYDfgXnc0TBOGseOpF67 zHoAn3bEditZdnj/OLGInp7FeCaxNQXH
=cOvZ
-----END PGP SIGNATURE-----