audit: use old_lock in audit_set_feature
authorGao feng <gaofeng@cn.fujitsu.com>
Fri, 1 Nov 2013 11:34:44 +0000 (19:34 +0800)
committerEric Paris <eparis@redhat.com>
Tue, 14 Jan 2014 03:30:19 +0000 (22:30 -0500)
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>
kernel/audit.c

index 2360da991721ac77e044f973384603b7695769b2..0d4865a50171bb78ead7a2f34ac2257cd226d235 100644 (file)
@@ -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;