diff options
author | Richard Guy Briggs <rgb@redhat.com> | 2013-11-21 13:57:33 -0500 |
---|---|---|
committer | Eric Paris <eparis@redhat.com> | 2014-01-13 22:32:06 -0500 |
commit | 4eb0f4abfb9441849530ea19389ae57cc62c8078 (patch) | |
tree | 0594e8a255258bfb21fadf622e46df95da86c918 /security | |
parent | 9ad42a79247d5e16d26f7d1531a68f20a889c5af (diff) |
smack: call WARN_ONCE() instead of calling audit_log_start()
Remove the call to audit_log() (which call audit_log_start()) and deal with
the errors in the caller, logging only once if the condition is met. Calling
audit_log_start() in this location makes buffer allocation and locking more
complicated in the calling tree (audit_filter_user()).
Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
Signed-off-by: Eric Paris <eparis@redhat.com>
Diffstat (limited to 'security')
-rw-r--r-- | security/smack/smack_lsm.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c index 8825375cc031..185e2e73cd33 100644 --- a/security/smack/smack_lsm.c +++ b/security/smack/smack_lsm.c | |||
@@ -3615,9 +3615,8 @@ static int smack_audit_rule_match(u32 secid, u32 field, u32 op, void *vrule, | |||
3615 | struct smack_known *skp; | 3615 | struct smack_known *skp; |
3616 | char *rule = vrule; | 3616 | char *rule = vrule; |
3617 | 3617 | ||
3618 | if (!rule) { | 3618 | if (unlikely(!rule)) { |
3619 | audit_log(actx, GFP_ATOMIC, AUDIT_SELINUX_ERR, | 3619 | WARN_ONCE(1, "Smack: missing rule\n"); |
3620 | "Smack: missing rule\n"); | ||
3621 | return -ENOENT; | 3620 | return -ENOENT; |
3622 | } | 3621 | } |
3623 | 3622 | ||