projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'drm-intel-next-2015-09-28-merged' of git://anongit.freedesktop.org/drm...
[linux-2.6-microblaze.git]
/
kernel
/
auditsc.c
diff --git
a/kernel/auditsc.c
b/kernel/auditsc.c
index
e85bdfd
..
b86cc04
100644
(file)
--- a/
kernel/auditsc.c
+++ b/
kernel/auditsc.c
@@
-180,7
+180,7
@@
static int audit_match_filetype(struct audit_context *ctx, int val)
return 0;
list_for_each_entry(n, &ctx->names_list, list) {
return 0;
list_for_each_entry(n, &ctx->names_list, list) {
- if ((n->ino !=
-1
) &&
+ if ((n->ino !=
AUDIT_INO_UNSET
) &&
((n->mode & S_IFMT) == mode))
return 1;
}
((n->mode & S_IFMT) == mode))
return 1;
}
@@
-466,6
+466,9
@@
static int audit_filter_rules(struct task_struct *tsk,
result = audit_comparator(ctx->ppid, f->op, f->val);
}
break;
result = audit_comparator(ctx->ppid, f->op, f->val);
}
break;
+ case AUDIT_EXE:
+ result = audit_exe_compare(tsk, rule->exe);
+ break;
case AUDIT_UID:
result = audit_uid_comparator(cred->uid, f->op, f->uid);
break;
case AUDIT_UID:
result = audit_uid_comparator(cred->uid, f->op, f->uid);
break;
@@
-1680,7
+1683,7
@@
static struct audit_names *audit_alloc_name(struct audit_context *context,
aname->should_free = true;
}
aname->should_free = true;
}
- aname->ino =
(unsigned long)-1
;
+ aname->ino =
AUDIT_INO_UNSET
;
aname->type = type;
list_add_tail(&aname->list, &context->names_list);
aname->type = type;
list_add_tail(&aname->list, &context->names_list);
@@
-1922,7
+1925,7
@@
void __audit_inode_child(const struct inode *parent,
if (inode)
audit_copy_inode(found_child, dentry, inode);
else
if (inode)
audit_copy_inode(found_child, dentry, inode);
else
- found_child->ino =
(unsigned long)-1
;
+ found_child->ino =
AUDIT_INO_UNSET
;
}
EXPORT_SYMBOL_GPL(__audit_inode_child);
}
EXPORT_SYMBOL_GPL(__audit_inode_child);