From bd2e5a471d8f124398717ae565b45772f5fa7bf4 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Mon, 18 Feb 2008 18:46:56 -0800 Subject: [PATCH] --- yaml --- r: 85788 b: refs/heads/master c: 9a4c8546f3e7c893888bccc2b3416d6214f2664a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/auditsc.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 015aa12b5031..985c4e892f80 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 14e04c3f6e64bac468f0aa38c6d47aa95b60c074 +refs/heads/master: 9a4c8546f3e7c893888bccc2b3416d6214f2664a diff --git a/trunk/kernel/auditsc.c b/trunk/kernel/auditsc.c index ac6d9b23b018..2087d6de67ea 100644 --- a/trunk/kernel/auditsc.c +++ b/trunk/kernel/auditsc.c @@ -1000,9 +1000,10 @@ 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 = -1) || len > MAX_ARG_STRLEN - 1)) { + if (unlikely((len == -1) || len > MAX_ARG_STRLEN - 1)) { WARN_ON(1); send_sig(SIGKILL, current, 0); + return -1; } /* walk the whole argument looking for non-ascii chars */ @@ -1020,6 +1021,7 @@ static int audit_log_single_execve_arg(struct audit_context *context, if (ret) { WARN_ON(1); send_sig(SIGKILL, current, 0); + return -1; } buf[to_send] = '\0'; has_cntl = audit_string_contains_control(buf, to_send); @@ -1083,6 +1085,7 @@ static int audit_log_single_execve_arg(struct audit_context *context, if (ret) { WARN_ON(1); send_sig(SIGKILL, current, 0); + return -1; } buf[to_send] = '\0';