mirror of
https://github.com/torvalds/linux.git
synced 2026-07-27 09:36:22 +02:00
audit: use 'unsigned int' instead of 'unsigned'
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 <rrobaina@redhat.com> Signed-off-by: Paul Moore <paul@paul-moore.com>
This commit is contained in:
parent
254f49634e
commit
8b22677101
|
|
@ -133,8 +133,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 */
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -2030,7 +2030,7 @@ void audit_log_vformat(struct audit_buffer *ab, const char *fmt, va_list args)
|
|||
* 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);
|
||||
|
|
|
|||
|
|
@ -233,7 +233,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);
|
||||
|
|
|
|||
|
|
@ -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[] __counted_by(count);
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -244,7 +244,7 @@ static void audit_watch_log_rule_change(struct audit_krule *r, struct audit_watc
|
|||
/* Update inode info in audit rules based on filesystem event. */
|
||||
static void audit_update_watch(struct audit_parent *parent,
|
||||
const struct qstr *dname, dev_t dev,
|
||||
u64 ino, unsigned invalidating)
|
||||
u64 ino, unsigned int invalidating)
|
||||
{
|
||||
struct audit_watch *owatch, *nwatch, *nextw;
|
||||
struct audit_krule *r, *nextr;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -150,7 +150,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;
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user