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

Merge tag 'audit-pr-20220801' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit 

Pull audit updates from Paul Moore:
 "Two minor audit patches: on marks a function as static, the other
  removes a redundant length check"

* tag 'audit-pr-20220801' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit:
  audit: make is_audit_feature_set() static
  audit: remove redundant data_len check
parents 79802ada 54609320

include/linux/audit.h

+0 −2
Original line number Diff line number Diff line
@@ -119,8 +119,6 @@ enum audit_nfcfgop { 
	AUDIT_NFT_OP_INVALID,

};



extern int is_audit_feature_set(int which);



extern int __init audit_register_class(int class, unsigned *list);

extern int audit_classify_syscall(int abi, unsigned syscall);

extern int audit_classify_arch(int arch);

kernel/audit.c

+2 −2
Original line number Diff line number Diff line
@@ -1100,7 +1100,7 @@ static inline void audit_log_user_recv_msg(struct audit_buffer **ab, 
	audit_log_common_recv_msg(NULL, ab, msg_type);

}



int is_audit_feature_set(int i)

static int is_audit_feature_set(int i)

{

	return af.features & AUDIT_FEATURE_TO_MASK(i);

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

			} else {

				audit_log_format(ab, " data=");

				if (data_len > 0 && str[data_len - 1] == '\0')

				if (str[data_len - 1] == '\0')

					data_len--;

				audit_log_n_untrustedstring(ab, str, data_len);

			}