Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Simple cases of overlapping changes in the packet scheduler.

Must easier to resolve this time.

Which probably means that I screwed it up somehow.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 2 insertions, 2 deletions

diff --git a/security/apparmor/ipc.c b/security/apparmor/ipc.c
index 66fb9ede9447..7ca0032e7ba9 100644
--- a/security/apparmor/ipc.c
+++ b/security/apparmor/ipc.c
@@ -128,7 +128,7 @@ static inline int map_signal_num(int sig)
                 return SIGUNKNOWN;
         else if (sig >= SIGRTMIN)
                 return sig - SIGRTMIN + 128;    /* rt sigs mapped to 128 */
-        else if (sig <= MAXMAPPED_SIG)
+        else if (sig < MAXMAPPED_SIG)
                 return sig_map[sig];
         return SIGUNKNOWN;
 }
@@ -163,7 +163,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_SIG)
                 audit_log_format(ab, " signal=%s", sig_names[aad(sa)->signal]);
         else
                 audit_log_format(ab, " signal=rtmin+%d",