]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] kernel/audit.c: nlh->nlmsg_type is gotten more than once
authorPeng Haitao <penght@cn.fujitsu.com>
Fri, 16 May 2008 02:15:04 +0000 (10:15 +0800)
committerAl Viro <viro@zeniv.linux.org.uk>
Wed, 25 Jun 2008 03:36:21 +0000 (23:36 -0400)
The first argument "nlh->nlmsg_type" of audit_receive_filter() should be modified to "msg_type" in audit_receive_msg().

Signed-off-by: Peng Haitao <penght@cn.fujitsu.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
kernel/audit.c

index e8692a5748c24d2bd841ea7a81eaa09ae992bb04..56f30287e24c486497e6462620e54f55ba8e1016 100644 (file)
@@ -779,7 +779,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
                }
                /* fallthrough */
        case AUDIT_LIST:
-               err = audit_receive_filter(nlh->nlmsg_type, NETLINK_CB(skb).pid,
+               err = audit_receive_filter(msg_type, NETLINK_CB(skb).pid,
                                           uid, seq, data, nlmsg_len(nlh),
                                           loginuid, sessionid, sid);
                break;
@@ -798,7 +798,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
                }
                /* fallthrough */
        case AUDIT_LIST_RULES:
-               err = audit_receive_filter(nlh->nlmsg_type, NETLINK_CB(skb).pid,
+               err = audit_receive_filter(msg_type, NETLINK_CB(skb).pid,
                                           uid, seq, data, nlmsg_len(nlh),
                                           loginuid, sessionid, sid);
                break;