X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=kernel%2Fauditsc.c;h=e85bdfd15fedd4c8fed46818edae6191673bff07;hb=51126f60491ab1a4952e2a2e93579c9b1deee9d2;hp=09c65640cad6156f0ea702bc32ba9847b9465249;hpb=b53343fc6c6f30ff5c6391d6f56d531afc2f4f7a;p=deliverable%2Flinux.git

diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index 09c65640cad6..e85bdfd15fed 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -1021,8 +1021,7 @@ static int audit_log_single_execve_arg(struct audit_context *context,
 	 * for strings that are too long, we should not have created
 	 * any.
 	 */
-	if (unlikely((len == 0) || len > MAX_ARG_STRLEN - 1)) {
-		WARN_ON(1);
+	if (WARN_ON_ONCE(len < 0 || len > MAX_ARG_STRLEN - 1)) {
 		send_sig(SIGKILL, current, 0);
 		return -1;
 	}