From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5C5B328C854 for ; Wed, 22 Jul 2026 10:30:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784716253; cv=none; b=SsE+65cOaSwwmp2ZYPQKDSv8FkBAnpiRVMStZ3D35M1DT3r3AlIQgniZWEz7914eMmdIBx4jrKYBkwE9XQ4bNxvaWDjLQv0WtRvjTW9iW5zQ09KMQrYJclB6lnxFbVGdGeAimNAyqJnBWjbfxmIEHUyBeSX3uBupReugOIs9Q4c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784716253; c=relaxed/simple; bh=uZbl3OBwcmFldac4P7/p2mfrLXAdUCoX8G15jFxiDDw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fgHPrPd1YAWObkglOB571/Cz0k27p2++qM72wsR+bgrt6JmUSVsRPLOdrkkNRCN8KiYry09abTfeWf+8GWT/S/boM+1RozsSfgUvLa4gQokkpBAmHpmKT0B8ng4kOCWMYGIBSHC+4dlXpptCEpwFkqp6OozOl78wzSjs71mvIU4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=n07/P1XK; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="n07/P1XK" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C10FF1F00A3A; Wed, 22 Jul 2026 10:30:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1784716252; bh=vQOSU4RaustqZn6Ej85463sWtuIOnQLieeVQ+64FbaQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=n07/P1XK680/RXXoYG44HxANh555uSfYFgpTF1N3TUEZBaqIZRygwXED5LmejTJ6l qBR3em3Bc5fKOrlDjuUaouWQVXW+aZYHKTEhqoeEjvw8w6+zfeJ08/qo6g9aiMdN/v WjpEMTKo6PNdyt9TuIF9uNXcYrJYXL/Jigur3MxwMsvyZZxgo9JVnL7+slfORRSeQ8 MJxo46bY9jzjZoFhjN+qqOM/LBWtl+jKyqgwV6plFH5d/FBN+mb/Elv9YB2xImVdI+ /cJbRi4rw6Ego41d6+A+oGX5EqDrCD4ep7ITot2rjVNdNvXQ9JeBtrPkiDTjoA+Ekf VgRbpi5vRH3Jw== From: Sasha Levin To: stable@vger.kernel.org Cc: Ricardo Robaina , Paul Moore , Sasha Levin Subject: [PATCH 6.1.y 3/4] audit: use 'unsigned int' instead of 'unsigned' Date: Wed, 22 Jul 2026 06:30:47 -0400 Message-ID: <20260722103048.891900-3-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260722103048.891900-1-sashal@kernel.org> References: <2026071652-lying-deacon-92a0@gregkh> <20260722103048.891900-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Ricardo Robaina [ Upstream commit 8b226771014beab1292081151a99530886ce54b4 ] Address checkpatch.pl warning below, across the audit subsystem: WARNING: Prefer 'unsigned int' to bare use of 'unsigned' Minor cleanup, no functional changes. Signed-off-by: Ricardo Robaina Signed-off-by: Paul Moore Stable-dep-of: 81905b5acbe7 ("audit: fix recursive locking deadlock in audit_dupe_exe()") Signed-off-by: Sasha Levin --- include/linux/audit.h | 4 ++-- include/linux/audit_arch.h | 12 ++++++------ kernel/audit.c | 2 +- kernel/audit.h | 2 +- kernel/audit_tree.c | 2 +- kernel/auditfilter.c | 8 ++++---- kernel/auditsc.c | 2 +- lib/compat_audit.c | 12 ++++++------ 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/include/linux/audit.h b/include/linux/audit.h index c86c2280231b72..00e3ddba71930f 100644 --- a/include/linux/audit.h +++ b/include/linux/audit.h @@ -119,8 +119,8 @@ enum audit_nfcfgop { AUDIT_NFT_OP_INVALID, }; -extern int __init audit_register_class(int class, unsigned *list); -extern int audit_classify_syscall(int abi, unsigned syscall); +extern int __init audit_register_class(int class, unsigned int *list); +extern int audit_classify_syscall(int abi, unsigned int syscall); extern int audit_classify_arch(int arch); /* audit_names->type values */ diff --git a/include/linux/audit_arch.h b/include/linux/audit_arch.h index 2b8153791e6a5d..a35069a6c15de2 100644 --- a/include/linux/audit_arch.h +++ b/include/linux/audit_arch.h @@ -21,13 +21,13 @@ enum auditsc_class_t { AUDITSC_NVALS /* count */ }; -extern int audit_classify_compat_syscall(int abi, unsigned syscall); +extern int audit_classify_compat_syscall(int abi, unsigned int syscall); /* only for compat system calls */ -extern unsigned compat_write_class[]; -extern unsigned compat_read_class[]; -extern unsigned compat_dir_class[]; -extern unsigned compat_chattr_class[]; -extern unsigned compat_signal_class[]; +extern unsigned int compat_write_class[]; +extern unsigned int compat_read_class[]; +extern unsigned int compat_dir_class[]; +extern unsigned int compat_chattr_class[]; +extern unsigned int compat_signal_class[]; #endif diff --git a/kernel/audit.c b/kernel/audit.c index 4a94c2410530b2..30f315ffe4fb52 100644 --- a/kernel/audit.c +++ b/kernel/audit.c @@ -1987,7 +1987,7 @@ static void audit_log_vformat(struct audit_buffer *ab, const char *fmt, * here and AUDIT_BUFSIZ is at least 1024, then we can * log everything that printk could have logged. */ avail = audit_expand(ab, - max_t(unsigned, AUDIT_BUFSIZ, 1+len-avail)); + max_t(unsigned int, AUDIT_BUFSIZ, 1+len-avail)); if (!avail) goto out_va_end; len = vsnprintf(skb_tail_pointer(skb), avail, fmt, args2); diff --git a/kernel/audit.h b/kernel/audit.h index c104c6f9d1d762..cdcc1405b4118f 100644 --- a/kernel/audit.h +++ b/kernel/audit.h @@ -227,7 +227,7 @@ static inline int audit_hash_ino(u64 ino) /* Indicates that audit should log the full pathname. */ #define AUDIT_NAME_FULL -1 -extern int audit_match_class(int class, unsigned syscall); +extern int audit_match_class(int class, unsigned int syscall); extern int audit_comparator(const u32 left, const u32 op, const u32 right); extern int audit_uid_comparator(kuid_t left, u32 op, kuid_t right); extern int audit_gid_comparator(kgid_t left, u32 op, kgid_t right); diff --git a/kernel/audit_tree.c b/kernel/audit_tree.c index e867c17d3f84df..17125ac3a5737b 100644 --- a/kernel/audit_tree.c +++ b/kernel/audit_tree.c @@ -33,7 +33,7 @@ struct audit_chunk { struct audit_node { struct list_head list; struct audit_tree *owner; - unsigned index; /* index; upper bit indicates 'will prune' */ + unsigned int index; /* index; upper bit indicates 'will prune' */ } owners[]; }; diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c index 6c9a4d322309f2..6e5de5d86f1558 100644 --- a/kernel/auditfilter.c +++ b/kernel/auditfilter.c @@ -165,13 +165,13 @@ static inline int audit_to_inode(struct audit_krule *krule, static __u32 *classes[AUDIT_SYSCALL_CLASSES]; -int __init audit_register_class(int class, unsigned *list) +int __init audit_register_class(int class, unsigned int *list) { __u32 *p = kcalloc(AUDIT_BITMASK_SIZE, sizeof(__u32), GFP_KERNEL); if (!p) return -ENOMEM; while (*list != ~0U) { - unsigned n = *list++; + unsigned int n = *list++; if (n >= AUDIT_BITMASK_SIZE * 32 - AUDIT_SYSCALL_CLASSES) { kfree(p); return -EINVAL; @@ -186,7 +186,7 @@ int __init audit_register_class(int class, unsigned *list) return 0; } -int audit_match_class(int class, unsigned syscall) +int audit_match_class(int class, unsigned int syscall) { if (unlikely(syscall >= AUDIT_BITMASK_SIZE * 32)) return 0; @@ -237,7 +237,7 @@ static int audit_match_signal(struct audit_entry *entry) /* Common user-space to kernel rule translation. */ static inline struct audit_entry *audit_to_entry_common(struct audit_rule_data *rule) { - unsigned listnr; + unsigned int listnr; struct audit_entry *entry; int i, err; diff --git a/kernel/auditsc.c b/kernel/auditsc.c index a509e58db55442..b3bf5cd57171b4 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c @@ -147,7 +147,7 @@ static const struct audit_nfcfgop_tab audit_nfcfgs[] = { static int audit_match_perm(struct audit_context *ctx, int mask) { - unsigned n; + unsigned int n; if (unlikely(!ctx)) return 0; diff --git a/lib/compat_audit.c b/lib/compat_audit.c index 3d6b8996f027df..fee1dfccd116b0 100644 --- a/lib/compat_audit.c +++ b/lib/compat_audit.c @@ -4,32 +4,32 @@ #include #include -unsigned compat_dir_class[] = { +unsigned int compat_dir_class[] = { #include ~0U }; -unsigned compat_read_class[] = { +unsigned int compat_read_class[] = { #include ~0U }; -unsigned compat_write_class[] = { +unsigned int compat_write_class[] = { #include ~0U }; -unsigned compat_chattr_class[] = { +unsigned int compat_chattr_class[] = { #include ~0U }; -unsigned compat_signal_class[] = { +unsigned int compat_signal_class[] = { #include ~0U }; -int audit_classify_compat_syscall(int abi, unsigned syscall) +int audit_classify_compat_syscall(int abi, unsigned int syscall) { switch (syscall) { #ifdef __NR_open -- 2.53.0