aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
authorPaul Moore <paul@paul-moore.com>2026-05-27 19:24:43 -0400
committerPaul Moore <paul@paul-moore.com>2026-05-27 19:24:43 -0400
commit7aefee0518c3b9b22fcca270586465dcdd164dbc (patch)
tree81786a52297262ad920ac893953e378800b00b30 /lib
parent5200f5f493f79f14bbdc349e402a40dfb32f23c8 (diff)
parent78e3417e5f7c8b25234baadc3875ce7de109bb37 (diff)
downloadlinux-next-history-7aefee0518c3b9b22fcca270586465dcdd164dbc.tar.gz
Automated merge of 'dev' into 'next'
* dev: audit: fix recursive locking deadlock in audit_dupe_exe() audit: fix removal of dangling executable rules audit: use 'unsigned int' instead of 'unsigned'
Diffstat (limited to 'lib')
-rw-r--r--lib/compat_audit.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/compat_audit.c b/lib/compat_audit.c
index 3d6b8996f027d..fee1dfccd116b 100644
--- a/lib/compat_audit.c
+++ b/lib/compat_audit.c
@@ -4,32 +4,32 @@
#include <linux/audit_arch.h>
#include <asm/unistd32.h>
-unsigned compat_dir_class[] = {
+unsigned int compat_dir_class[] = {
#include <asm-generic/audit_dir_write.h>
~0U
};
-unsigned compat_read_class[] = {
+unsigned int compat_read_class[] = {
#include <asm-generic/audit_read.h>
~0U
};
-unsigned compat_write_class[] = {
+unsigned int compat_write_class[] = {
#include <asm-generic/audit_write.h>
~0U
};
-unsigned compat_chattr_class[] = {
+unsigned int compat_chattr_class[] = {
#include <asm-generic/audit_change_attr.h>
~0U
};
-unsigned compat_signal_class[] = {
+unsigned int compat_signal_class[] = {
#include <asm-generic/audit_signal.h>
~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