Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 017143fe authored by Eric W. Biederman's avatar Eric W. Biederman
Browse files

audit: Remove the unused uid parameter from audit_receive_filter 



Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Eric Paris <eparis@redhat.com>
Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
parent 35ce9888

include/linux/audit.h

+1 −1
Original line number Diff line number Diff line
@@ -702,7 +702,7 @@ extern int audit_update_lsm_rules(void); 
				/* Private API (for audit.c only) */

extern int audit_filter_user(void);

extern int audit_filter_type(int type);

extern int  audit_receive_filter(int type, int pid, int uid, int seq,

extern int  audit_receive_filter(int type, int pid, int seq,

				void *data, size_t datasz, uid_t loginuid,

				u32 sessionid, u32 sid);

extern int audit_enabled;

kernel/audit.c

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

	case AUDIT_LIST:

		err = audit_receive_filter(msg_type, NETLINK_CB(skb).pid,

					   uid, seq, data, nlmsg_len(nlh),

					   seq, data, nlmsg_len(nlh),

					   loginuid, sessionid, sid);

		break;

	case AUDIT_ADD_RULE:
@@ -790,7 +790,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh) 
		/* fallthrough */

	case AUDIT_LIST_RULES:

		err = audit_receive_filter(msg_type, NETLINK_CB(skb).pid,

					   uid, seq, data, nlmsg_len(nlh),

					   seq, data, nlmsg_len(nlh),

					   loginuid, sessionid, sid);

		break;

	case AUDIT_TRIM:

kernel/auditfilter.c

+1 −1
Original line number Diff line number Diff line
@@ -1098,7 +1098,7 @@ static void audit_log_rule_change(uid_t loginuid, u32 sessionid, u32 sid, 
 * @sessionid: sessionid for netlink audit message

 * @sid: SE Linux Security ID of sender

 */

int audit_receive_filter(int type, int pid, int uid, int seq, void *data,

int audit_receive_filter(int type, int pid, int seq, void *data,

			 size_t datasz, uid_t loginuid, u32 sessionid, u32 sid)

{

	struct task_struct *tsk;