summaryrefslogtreecommitdiffstats
path: root/kernel/audit.c
diff options
context:
space:
mode:
authorGao feng <gaofeng@cn.fujitsu.com>2013-11-01 19:34:44 +0800
committerEric Paris <eparis@redhat.com>2014-01-13 22:30:19 -0500
commit4547b3bc43c64389ca4368be0edf1f90ae1b938d (patch)
treecfe1d6def81ecf361a655b7825c4f180b2e4dfc2 /kernel/audit.c
parentb6c50fe0be5b3a6be9c26f6941bc8c94cfaac1f8 (diff)
downloadop-kernel-dev-4547b3bc43c64389ca4368be0edf1f90ae1b938d.zip
op-kernel-dev-4547b3bc43c64389ca4368be0edf1f90ae1b938d.tar.gz
audit: use old_lock in audit_set_feature
we already have old_lock, no need to calculate it again. Acked-by: Eric Paris <eparis@redhat.com> Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com> Signed-off-by: Richard Guy Briggs <rgb@redhat.com> Signed-off-by: Eric Paris <eparis@redhat.com>
Diffstat (limited to 'kernel/audit.c')
-rw-r--r--kernel/audit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/audit.c b/kernel/audit.c
index 2360da9..0d4865a 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -714,7 +714,7 @@ static int audit_set_feature(struct sk_buff *skb)
old_lock = af.lock & feature;
/* are we changing a locked feature? */
- if ((af.lock & feature) && (new_feature != old_feature)) {
+ if (old_lock && (new_feature != old_feature)) {
audit_log_feature_change(i, old_feature, new_feature,
old_lock, new_lock, 0);
return -EPERM;
OpenPOWER on IntegriCloud