Commit f2c0d026 authored Aug 08, 2011 by Jonathan Nieder Committed by Linus Torvalds Aug 09, 2011

cap_syslog: don't use WARN_ONCE for CAP_SYS_ADMIN deprecation warning



syslog-ng versions before 3.3.0beta1 (2011-05-12) assume that
CAP_SYS_ADMIN is sufficient to access syslog, so ever since CAP_SYSLOG
was introduced (2010-11-25) they have triggered a warning.

Commit ee24aebf ("cap_syslog: accept CAP_SYS_ADMIN for now")
improved matters a little by making syslog-ng work again, just keeping
the WARN_ONCE().  But still, this is a warning that writes a stack trace
we don't care about to syslog, sets a taint flag, and alarms sysadmins
when nothing worse has happened than use of an old userspace with a
recent kernel.

Convert the WARN_ONCE to a printk_once to avoid that while continuing to
give userspace developers a hint that this is an unwanted
backward-compatibility feature and won't be around forever.

Reported-by: Ralf Hildebrandt <ralf.hildebrandt@charite.de>
Reported-by: Niels <zorglub_olsen@hotmail.com>
Reported-by: Paweł Sikora <pluto@agmk.net>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Liked-by: Gergely Nagy <algernon@madhouse-project.org>
Acked-by: Serge Hallyn <serge@hallyn.com>
Acked-by: James Morris <jmorris@namei.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 9f50fad6

kernel/printk.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -318,8 +318,10 @@ static int check_syslog_permissions(int type, bool from_file)
		return 0;
		/* For historical reasons, accept CAP_SYS_ADMIN too, with a warning */
		if (capable(CAP_SYS_ADMIN)) {
		WARN_ONCE(1, "Attempt to access syslog with CAP_SYS_ADMIN "
		"but no CAP_SYSLOG (deprecated).\n");
		printk_once(KERN_WARNING "%s (%d): "
		"Attempt to access syslog with CAP_SYS_ADMIN "
		"but no CAP_SYSLOG (deprecated).\n",
		current->comm, task_pid_nr(current));
		return 0;
		}
		return -EPERM;

Admin message