Commit 13d5ef97 authored by Peng Haitao's avatar Peng Haitao Committed by Al Viro
Browse files

[PATCH] kernel/audit.c: nlh->nlmsg_type is gotten more than once 



The first argument "nlh->nlmsg_type" of audit_receive_filter() should be modified to "msg_type" in audit_receive_msg().

Signed-off-by: default avatarPeng Haitao <penght@cn.fujitsu.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 481c5346

kernel/audit.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -779,7 +779,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh) 
		}

		}

		/* fallthrough */

		/* fallthrough */

	case AUDIT_LIST:

	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),

					   uid, seq, data, nlmsg_len(nlh),

					   loginuid, sessionid, sid);

					   loginuid, sessionid, sid);

		break;

		break;
@@ -798,7 +798,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh) 
		}

		}

		/* fallthrough */

		/* fallthrough */

	case AUDIT_LIST_RULES:

	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),

					   uid, seq, data, nlmsg_len(nlh),

					   loginuid, sessionid, sid);

					   loginuid, sessionid, sid);

		break;

		break;