From 3104d0e94f7169ab589919f7c4ed6197f0a826cb Mon Sep 17 00:00:00 2001 From: Li zeming Date: Thu, 28 Dec 2023 10:56:00 +0800 Subject: [PATCH 1/2] audit: remove unnecessary assignment in audit_dupe_lsm_field() The ret variable is assigned when it does not need to be defined, as it has already been assigned before use. Signed-off-by: Li zeming [PM: rewrite subject line] Signed-off-by: Paul Moore --- kernel/auditfilter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c index 8317a37dea0b..be8c680121e4 100644 --- a/kernel/auditfilter.c +++ b/kernel/auditfilter.c @@ -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 */ From aa13b709084a0287ef250a9fbde5993e4dfc3078 Mon Sep 17 00:00:00 2001 From: Kunwu Chan Date: Wed, 24 Jan 2024 14:02:24 +0800 Subject: [PATCH 2/2] audit: use KMEM_CACHE() instead of kmem_cache_create() Use the new KMEM_CACHE() macro instead of direct kmem_cache_create to simplify the creation of SLAB caches. Signed-off-by: Kunwu Chan [PM: subject line tweaks] Signed-off-by: Paul Moore --- kernel/audit.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/kernel/audit.c b/kernel/audit.c index 9c8e5f732c4c..e7a62ebbf4d1 100644 --- a/kernel/audit.c +++ b/kernel/audit.c @@ -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);