From c7c8cd32c40b398a883a70ff5bff41eb20db47c1 Mon Sep 17 00:00:00 2001
From: zhangxiliang <zhangxiliang@cn.fujitsu.com>
Date: Thu, 31 Jul 2008 10:11:19 +0800
Subject: [PATCH] --- yaml --- r: 107261 b: refs/heads/master c:
 20c6aaa39ab735c7ed78e4e5a214d250efae0a6e h: refs/heads/master i:   107259:
 c4c005f5f0e78a7d34c6c96c9f95561271d1447d v: v3

---
 [refs]               |  2 +-
 trunk/kernel/audit.c | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index f8ed45a8e44c..8350955c6b2a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 980dfb0db340b95094732d78b55311f2c539c1af
+refs/heads/master: 20c6aaa39ab735c7ed78e4e5a214d250efae0a6e
diff --git a/trunk/kernel/audit.c b/trunk/kernel/audit.c
index 6d903182c6b7..4414e93d8750 100644
--- a/trunk/kernel/audit.c
+++ b/trunk/kernel/audit.c
@@ -707,12 +707,14 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
 		if (status_get->mask & AUDIT_STATUS_ENABLED) {
 			err = audit_set_enabled(status_get->enabled,
 						loginuid, sessionid, sid);
-			if (err < 0) return err;
+			if (err < 0)
+				return err;
 		}
 		if (status_get->mask & AUDIT_STATUS_FAILURE) {
 			err = audit_set_failure(status_get->failure,
 						loginuid, sessionid, sid);
-			if (err < 0) return err;
+			if (err < 0)
+				return err;
 		}
 		if (status_get->mask & AUDIT_STATUS_PID) {
 			int new_pid = status_get->pid;
@@ -725,9 +727,12 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
 			audit_pid = new_pid;
 			audit_nlk_pid = NETLINK_CB(skb).pid;
 		}
-		if (status_get->mask & AUDIT_STATUS_RATE_LIMIT)
+		if (status_get->mask & AUDIT_STATUS_RATE_LIMIT) {
 			err = audit_set_rate_limit(status_get->rate_limit,
 						   loginuid, sessionid, sid);
+			if (err < 0)
+				return err;
+		}
 		if (status_get->mask & AUDIT_STATUS_BACKLOG_LIMIT)
 			err = audit_set_backlog_limit(status_get->backlog_limit,
 						      loginuid, sessionid, sid);