audit: ignore terminating NUL in AUDIT_USER_TTY messages

[linux-2.6-omap-h63xx.git] / kernel / audit.c

diff --git a/kernel/audit.c b/kernel/audit.c
index fa3805516dffd546b4d0ebe95f1e44d6c3c1e7b7..5560390cb0f5eec2d630144f8b4419974795c297 100644 (file)
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -766,6 +766,9 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
 
                                audit_log_format(ab, " msg=");
                                size = nlmsg_len(nlh);
+                               if (size > 0 &&
+                                   ((unsigned char *)data)[size - 1] == '\0')
+                                       size--;
                                audit_log_n_untrustedstring(ab, data, size);
                        }
                        audit_set_pid(ab, pid);