Skip to contentSkip to conversation

remove function audit_receive_filter here in kerenl/audit.c

PATCH In review Zhenwen Xu 2 participants 2 messages May 21, 2009 Audit

lore
Share & tools
lore

Zhenwen Xu

author
#0 lore raw

PATCH 1/1 remove function audit_receive_filter here in kerenl/audit.c

both case AUDIT_LIST: and case AUDIT_LIST_RULES: call this function audit_receive_filter in the same way, so I think we can put them together by removing another one.

---
 kernel/audit.c |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)
kernel/audit.c +1 -6
index 9442c35..40fc803 100644
@@ -790,6 +790,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
 		}
 		/* fallthrough */
 	case AUDIT_LIST:
+	case AUDIT_LIST_RULES:
 		err = audit_receive_filter(msg_type, NETLINK_CB(skb).pid,
 					   uid, seq, data, nlmsg_len(nlh),
 					   loginuid, sessionid, sid);
@@ -807,12 +808,6 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
 			audit_log_end(ab);
 			return -EPERM;
 		}
-		/* fallthrough */
-	case AUDIT_LIST_RULES:
-		err = audit_receive_filter(msg_type, NETLINK_CB(skb).pid,
-					   uid, seq, data, nlmsg_len(nlh),
-					   loginuid, sessionid, sid);
-		break;
 	case AUDIT_TRIM:
 		audit_trim_trees();
 
Signature · 5 lines
1.5.6.5

-- 
--------------------------------
http://zhwen.org - Open and Free
#1 lore raw
Quoted 13 lines
kernel/audit.c +1 -0
index 9442c35..40fc803 100644
@@ -790,6 +790,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
 		}
 		/* fallthrough */
 	case AUDIT_LIST:
+	case AUDIT_LIST_RULES:
 		err = audit_receive_filter(msg_type, NETLINK_CB(skb).pid,
 					   uid, seq, data, nlmsg_len(nlh),
 					   loginuid, sessionid, sid);

kernel/audit.c static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh) · line 810

Quoted 4 lines
kernel/audit.c +0 -1
@@ -807,12 +808,6 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
 			audit_log_end(ab);
 			return -EPERM;
 		}
-		/* fallthrough */

This patch is obviously wrong.

Quoted 8 lines
kernel/audit.c +0 -5
-	case AUDIT_LIST_RULES:
-		err = audit_receive_filter(msg_type, NETLINK_CB(skb).pid,
-					   uid, seq, data, nlmsg_len(nlh),
-					   loginuid, sessionid, sid);
-		break;
 	case AUDIT_TRIM:
 		audit_trim_trees();