Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1401285 > unrolled thread

[PATCH] audit: fixup: log on errors from filter user rules

Back to article view | Back to linux.kernel

Contents

  [PATCH] audit: fixup: log on errors from filter user rules Richard Guy Briggs <rgb@redhat.com> - 2016-05-16 04:50 +0200
    Re: [PATCH] audit: fixup: log on errors from filter user rules Paul Moore <pmoore@redhat.com> - 2016-05-20 20:40 +0200

#1401285 — [PATCH] audit: fixup: log on errors from filter user rules

In commit 724e4fcc the intention was to pass any errors back from
audit_filter_user_rules() to audit_filter_user().  Add that code.

Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
---
 kernel/auditfilter.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c
index b8ff9e1..96c9a1b 100644
--- a/kernel/auditfilter.c
+++ b/kernel/auditfilter.c
@@ -1339,8 +1339,8 @@ static int audit_filter_user_rules(struct audit_krule *rule, int type,
 			break;
 		}
 
-		if (!result)
-			return 0;
+		if (result <= 0)
+			return result;
 	}
 	switch (rule->action) {
 	case AUDIT_NEVER:    *state = AUDIT_DISABLED;	    break;
-- 
1.7.1

[toc] | [next] | [standalone]

#1404679

On Sunday, May 15, 2016 10:47:39 PM Richard Guy Briggs wrote:
> In commit 724e4fcc the intention was to pass any errors back from
> audit_filter_user_rules() to audit_filter_user().  Add that code.
> 
> Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
> ---
>  kernel/auditfilter.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)

Looks good to me; queued up and should appear in audit#next after the merge 
window closes.

> diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c
> index b8ff9e1..96c9a1b 100644
> --- a/kernel/auditfilter.c
> +++ b/kernel/auditfilter.c
> @@ -1339,8 +1339,8 @@ static int audit_filter_user_rules(struct audit_krule
> *rule, int type, break;
>  		}
> 
> -		if (!result)
> -			return 0;
> +		if (result <= 0)
> +			return result;
>  	}
>  	switch (rule->action) {
>  	case AUDIT_NEVER:    *state = AUDIT_DISABLED;	    break;

-- 
paul moore
security @ redhat

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web