[PATCH 08/12] [V3] fixup! audit: convert audit_exe to audit_fsnotify

Put audit_alloc_mark() arguments in same order as watch, tree and inode. Signed-off-by: Richard Guy Briggs <rgb(a)redhat.com&gt; --- kernel/audit.h | 2 +- kernel/audit_exe.c | 2 +- kernel/audit_fsnotify.c | 2 +- kernel/auditfilter.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kernel/audit.h b/kernel/audit.h index 61688ba..7bf3138 100644 --- a/kernel/audit.h +++ b/kernel/audit.h @@ -283,7 +283,7 @@ extern void audit_remove_watch_rule(struct audit_krule *krule); extern char *audit_watch_path(struct audit_watch *watch); extern int audit_watch_compare(struct audit_watch *watch, unsigned long ino, dev_t dev); -struct audit_fsnotify_mark *audit_alloc_mark(char *pathname, int len, struct audit_krule *krule); +struct audit_fsnotify_mark *audit_alloc_mark(struct audit_krule *krule, char *pathname, int len); char *audit_mark_path(struct audit_fsnotify_mark *mark); void audit_remove_mark(struct audit_fsnotify_mark *audit_mark); int audit_mark_compare(struct audit_fsnotify_mark *mark, unsigned long ino, dev_t dev); diff --git a/kernel/audit_exe.c b/kernel/audit_exe.c index b33a09a..0c7ee8d 100644 --- a/kernel/audit_exe.c +++ b/kernel/audit_exe.c @@ -29,7 +29,7 @@ int audit_dup_exe(struct audit_krule *new, struct audit_krule *old) pathname = audit_mark_path(old->exe); - audit_mark = audit_alloc_mark(pathname, strlen(pathname), new); + audit_mark = audit_alloc_mark(new, pathname, strlen(pathname)); if (IS_ERR(audit_mark)) return PTR_ERR(audit_mark); new->exe = audit_mark; diff --git a/kernel/audit_fsnotify.c b/kernel/audit_fsnotify.c index c396471..5469dc1 100644 --- a/kernel/audit_fsnotify.c +++ b/kernel/audit_fsnotify.c @@ -87,7 +87,7 @@ int audit_mark_compare(struct audit_fsnotify_mark *mark, unsigned long ino, dev_ return (mark->ino == ino) && (mark->dev == dev); } -struct audit_fsnotify_mark *audit_alloc_mark(char *pathname, int len, struct audit_krule *krule) +struct audit_fsnotify_mark *audit_alloc_mark(struct audit_krule *krule, char *pathname, int len) { struct audit_fsnotify_mark *audit_mark; struct path path; diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c index 7ffbd7d..c3bf4bb 100644 --- a/kernel/auditfilter.c +++ b/kernel/auditfilter.c @@ -560,7 +560,7 @@ static struct audit_entry *audit_data_to_entry(struct audit_rule_data *data, } entry->rule.buflen += f->val; - audit_mark = audit_alloc_mark(str, f->val, &entry->rule); + audit_mark = audit_alloc_mark(&entry->rule, str, f->val); if (IS_ERR(audit_mark)) { kfree(str); err = PTR_ERR(audit_mark); -- 1.7.1