apparmor: fix logging of the existence test for signals (98cf5bbf) · Commits · 戴 / test

The existence test is not being properly logged as the signal mapping maps it to the last entry in the named signal table. This is done to help catch bugs by making the 0 mapped signal value invalid so that we can catch the signal value not being filled in. When fixing the off-by-one comparision logic the reporting of the existence test was broken, because the logic behind the mapped named table was hidden. Fix this by adding a define for the name lookup and using it. Cc: Stable <stable@vger.kernel.org> Fixes: ("apparmor: fix off-by-one comparison on MAXMAPPED_SIG") Signed-off-by:

John Johansen <john.johansen@canonical.com>

security/apparmor/include/sig_names.h

+3 −1

Original line number	Diff line number	Diff line
		@@ -2,6 +2,8 @@

		#define SIGUNKNOWN 0
		#define MAXMAPPED_SIG 35
		#define MAXMAPPED_SIGNAME (MAXMAPPED_SIG + 1)

		/* provide a mapping of arch signal to internal signal # for mediation
		* those that are always an alias SIGCLD for SIGCLHD and SIGPOLL for SIGIO
		* map to the same entry those that may/or may not get a separate entry
		@@ -56,7 +58,7 @@ static const int sig_map[MAXMAPPED_SIG] = {
		};

		/* this table is ordered post sig_map[sig] mapping */
		static const char *const sig_names[MAXMAPPED_SIG + 1] = {
		static const char *const sig_names[MAXMAPPED_SIGNAME] = {
		"unknown",
		"hup",
		"int",

security/apparmor/ipc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -174,7 +174,7 @@ static void audit_signal_cb(struct audit_buffer ab, void va)
		audit_signal_mask(ab, aad(sa)->denied);
		}
		}
		if (aad(sa)->signal < MAXMAPPED_SIG)
		if (aad(sa)->signal < MAXMAPPED_SIGNAME)
		audit_log_format(ab, " signal=%s", sig_names[aad(sa)->signal]);
		else
		audit_log_format(ab, " signal=rtmin+%d",

Admin message