Commit 3749bda2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull audit updates from Paul Moore:
 "Two small audit patches:

   - Use the KMEM_CACHE() macro instead of kmem_cache_create()

     The guidance appears to be to use the KMEM_CACHE() macro when
     possible and there is no reason why we can't use the macro, so
     let's use it.

   - Remove an unnecessary assignment in audit_dupe_lsm_field()

     A return value variable was assigned a value in its declaration,
     but the declaration value is overwritten before the return value
     variable is ever referenced; drop the assignment at declaration
     time"

* tag 'audit-pr-20240312' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit:
  audit: use KMEM_CACHE() instead of kmem_cache_create()
  audit: remove unnecessary assignment in audit_dupe_lsm_field()
parents 681ba318 aa13b709

kernel/audit.c

+1 −3
Original line number Diff line number Diff line
@@ -1693,9 +1693,7 @@ static int __init audit_init(void) 
	if (audit_initialized == AUDIT_DISABLED)

		return 0;



	audit_buffer_cache = kmem_cache_create("audit_buffer",

					       sizeof(struct audit_buffer),

					       0, SLAB_PANIC, NULL);

	audit_buffer_cache = KMEM_CACHE(audit_buffer, SLAB_PANIC);



	skb_queue_head_init(&audit_queue);

	skb_queue_head_init(&audit_retry_queue);

kernel/auditfilter.c

+1 −1
Original line number Diff line number Diff line
@@ -788,7 +788,7 @@ static int audit_compare_rule(struct audit_krule *a, struct audit_krule *b) 
static inline int audit_dupe_lsm_field(struct audit_field *df,

					   struct audit_field *sf)

{

	int ret = 0;

	int ret;

	char *lsm_str;



	/* our own copy of lsm_str */