projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'nfs-for-4.1-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
[cascardo/linux.git]
/
kernel
/
auditsc.c
diff --git
a/kernel/auditsc.c
b/kernel/auditsc.c
index
dc4ae70
..
9fb9d1c
100644
(file)
--- a/
kernel/auditsc.c
+++ b/
kernel/auditsc.c
@@
-1629,7
+1629,7
@@
retry:
rcu_read_lock();
seq = read_seqbegin(&rename_lock);
for(;;) {
rcu_read_lock();
seq = read_seqbegin(&rename_lock);
for(;;) {
- struct inode *inode = d
->d_inode
;
+ struct inode *inode = d
_backing_inode(d)
;
if (inode && unlikely(!hlist_empty(&inode->i_fsnotify_marks))) {
struct audit_chunk *chunk;
chunk = audit_tree_lookup(inode);
if (inode && unlikely(!hlist_empty(&inode->i_fsnotify_marks))) {
struct audit_chunk *chunk;
chunk = audit_tree_lookup(inode);
@@
-1754,7
+1754,7
@@
void __audit_inode(struct filename *name, const struct dentry *dentry,
unsigned int flags)
{
struct audit_context *context = current->audit_context;
unsigned int flags)
{
struct audit_context *context = current->audit_context;
- const struct inode *inode = d
entry->d_inode
;
+ const struct inode *inode = d
_backing_inode(dentry)
;
struct audit_names *n;
bool parent = flags & AUDIT_INODE_PARENT;
struct audit_names *n;
bool parent = flags & AUDIT_INODE_PARENT;
@@
-1853,7
+1853,7
@@
void __audit_inode_child(const struct inode *parent,
const unsigned char type)
{
struct audit_context *context = current->audit_context;
const unsigned char type)
{
struct audit_context *context = current->audit_context;
- const struct inode *inode = d
entry->d_inode
;
+ const struct inode *inode = d
_backing_inode(dentry)
;
const char *dname = dentry->d_name.name;
struct audit_names *n, *found_parent = NULL, *found_child = NULL;
const char *dname = dentry->d_name.name;
struct audit_names *n, *found_parent = NULL, *found_child = NULL;
@@
-2361,7
+2361,6
@@
static void audit_log_task(struct audit_buffer *ab)
kuid_t auid, uid;
kgid_t gid;
unsigned int sessionid;
kuid_t auid, uid;
kgid_t gid;
unsigned int sessionid;
- struct mm_struct *mm = current->mm;
char comm[sizeof(current->comm)];
auid = audit_get_loginuid(current);
char comm[sizeof(current->comm)];
auid = audit_get_loginuid(current);
@@
-2376,13
+2375,7
@@
static void audit_log_task(struct audit_buffer *ab)
audit_log_task_context(ab);
audit_log_format(ab, " pid=%d comm=", task_pid_nr(current));
audit_log_untrustedstring(ab, get_task_comm(comm, current));
audit_log_task_context(ab);
audit_log_format(ab, " pid=%d comm=", task_pid_nr(current));
audit_log_untrustedstring(ab, get_task_comm(comm, current));
- if (mm) {
- down_read(&mm->mmap_sem);
- if (mm->exe_file)
- audit_log_d_path(ab, " exe=", &mm->exe_file->f_path);
- up_read(&mm->mmap_sem);
- } else
- audit_log_format(ab, " exe=(null)");
+ audit_log_d_path_exe(ab, current->mm);
}
/**
}
/**