Commit c9b07eab authored by Al Viro's avatar Al Viro
Browse files

audit_inode(): switch to passing AUDIT_INODE_... 



don't bother with remapping LOOKUP_... values - all callers pass
constants and we can just as well pass the right ones from the
very beginning.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 39145f5f

fs/namei.c

+3 −3
Original line number Diff line number Diff line
@@ -2391,7 +2391,7 @@ static struct filename *filename_parentat(int dfd, struct filename *name, 
	if (likely(!retval)) {

		*last = nd.last;

		*type = nd.last_type;

		audit_inode(name, parent->dentry, LOOKUP_PARENT);

		audit_inode(name, parent->dentry, AUDIT_INODE_PARENT);

	} else {

		putname(name);

		name = ERR_PTR(retval);
@@ -2718,7 +2718,7 @@ filename_mountpoint(int dfd, struct filename *name, struct path *path, 
	if (unlikely(error == -ESTALE))

		error = path_mountpoint(&nd, flags | LOOKUP_REVAL, path);

	if (likely(!error))

		audit_inode(name, path->dentry, LOOKUP_NO_EVAL);

		audit_inode(name, path->dentry, AUDIT_INODE_NOEVAL);

	restore_nameidata();

	putname(name);

	return error;
@@ -3299,7 +3299,7 @@ static int do_last(struct nameidata *nd, 
		if (error)

			return error;



		audit_inode(nd->name, dir, LOOKUP_PARENT);

		audit_inode(nd->name, dir, AUDIT_INODE_PARENT);

		/* trailing slashes? */

		if (unlikely(nd->last.name[nd->last.len]))

			return -EISDIR;

include/linux/audit.h

+7 −13
Original line number Diff line number Diff line
@@ -252,6 +252,10 @@ static inline int audit_signal_info(int sig, struct task_struct *t) 
#define audit_is_compat(arch)  false

#endif



#define AUDIT_INODE_PARENT	1	/* dentry represents the parent */

#define AUDIT_INODE_HIDDEN	2	/* audit record should be hidden */

#define AUDIT_INODE_NOEVAL	4	/* audit record incomplete */



#ifdef CONFIG_AUDITSYSCALL

#include <asm/syscall.h> /* for syscall_get_arch() */
@@ -265,9 +269,6 @@ extern void __audit_syscall_exit(int ret_success, long ret_value); 
extern struct filename *__audit_reusename(const __user char *uptr);

extern void __audit_getname(struct filename *name);



#define AUDIT_INODE_PARENT	1	/* dentry represents the parent */

#define AUDIT_INODE_HIDDEN	2	/* audit record should be hidden */

#define AUDIT_INODE_NOEVAL	4	/* audit record incomplete */

extern void __audit_inode(struct filename *name, const struct dentry *dentry,

				unsigned int flags);

extern void __audit_file(const struct file *);
@@ -328,17 +329,10 @@ static inline void audit_getname(struct filename *name) 
}

static inline void audit_inode(struct filename *name,

				const struct dentry *dentry,

				unsigned int flags) {

	if (unlikely(!audit_dummy_context())) {

		unsigned int aflags = 0;



		if (flags & LOOKUP_PARENT)

			aflags |= AUDIT_INODE_PARENT;

		if (flags & LOOKUP_NO_EVAL)

			aflags |= AUDIT_INODE_NOEVAL;

				unsigned int aflags) {

	if (unlikely(!audit_dummy_context()))

		__audit_inode(name, dentry, aflags);

}

}

static inline void audit_file(struct file *file)

{

	if (unlikely(!audit_dummy_context()))
@@ -561,7 +555,7 @@ static inline void __audit_inode_child(struct inode *parent, 
{ }

static inline void audit_inode(struct filename *name,

				const struct dentry *dentry,

				unsigned int parent)

				unsigned int aflags)

{ }

static inline void audit_file(struct file *file)

{