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

Commit a4480ac4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'audit.b52' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current 

* 'audit.b52' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current:
  [PATCH] remove useless argument type in audit_filter_user()
  [PATCH] audit: fix kernel-doc parameter notation
  [PATCH] kernel/audit.c: nlh->nlmsg_type is gotten more than once
parents 4f46acce d8de7247

include/linux/audit.h

+1 −1
Original line number Diff line number Diff line
@@ -571,7 +571,7 @@ extern void audit_log_lost(const char *message); 
extern int		    audit_update_lsm_rules(void);



				/* Private API (for audit.c only) */

extern int audit_filter_user(struct netlink_skb_parms *cb, int type);

extern int audit_filter_user(struct netlink_skb_parms *cb);

extern int audit_filter_type(int type);

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

				void *data, size_t datasz, uid_t loginuid,

kernel/audit.c

+3 −3
Original line number Diff line number Diff line
@@ -738,7 +738,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh) 
		if (!audit_enabled && msg_type != AUDIT_USER_AVC)

			return 0;



		err = audit_filter_user(&NETLINK_CB(skb), msg_type);

		err = audit_filter_user(&NETLINK_CB(skb));

		if (err == 1) {

			err = 0;

			if (msg_type == AUDIT_USER_TTY) {
@@ -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;

kernel/auditfilter.c

+2 −1
Original line number Diff line number Diff line
@@ -1544,6 +1544,7 @@ static void audit_log_rule_change(uid_t loginuid, u32 sessionid, u32 sid, 
 * @data: payload data

 * @datasz: size of payload data

 * @loginuid: loginuid of sender

 * @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,
@@ -1720,7 +1721,7 @@ static int audit_filter_user_rules(struct netlink_skb_parms *cb, 
	return 1;

}



int audit_filter_user(struct netlink_skb_parms *cb, int type)

int audit_filter_user(struct netlink_skb_parms *cb)

{

	enum audit_state state = AUDIT_DISABLED;

	struct audit_entry *e;