diff options
author | Richard Guy Briggs <rgb@redhat.com> | 2018-03-21 04:42:20 -0400 |
---|---|---|
committer | Paul Moore <paul@paul-moore.com> | 2018-03-21 11:17:41 -0400 |
commit | 94b9d9b7a14cbb1640868d53b27f403ed2e5b4a9 (patch) | |
tree | 26ff28aadfe906d76d90306504e7f1280c317e7f | |
parent | 45b578fe4c3cade6f4ca1fc934ce199afd857edc (diff) |
audit: remove path param from link denied function
In commit 45b578fe4c3cade6f4ca1fc934ce199afd857edc
("audit: link denied should not directly generate PATH record")
the need for the struct path *link parameter was removed.
Remove the now useless struct path argument.
Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
Signed-off-by: Paul Moore <paul@paul-moore.com>
-rw-r--r-- | fs/namei.c | 4 | ||||
-rw-r--r-- | include/linux/audit.h | 6 | ||||
-rw-r--r-- | kernel/audit.c | 3 |
3 files changed, 5 insertions, 8 deletions
diff --git a/fs/namei.c b/fs/namei.c index 9cc91fb7f156..e3682bb72cb5 100644 --- a/fs/namei.c +++ b/fs/namei.c | |||
@@ -945,7 +945,7 @@ static inline int may_follow_link(struct nameidata *nd) | |||
945 | if (nd->flags & LOOKUP_RCU) | 945 | if (nd->flags & LOOKUP_RCU) |
946 | return -ECHILD; | 946 | return -ECHILD; |
947 | 947 | ||
948 | audit_log_link_denied("follow_link", &nd->stack[0].link); | 948 | audit_log_link_denied("follow_link"); |
949 | return -EACCES; | 949 | return -EACCES; |
950 | } | 950 | } |
951 | 951 | ||
@@ -1011,7 +1011,7 @@ static int may_linkat(struct path *link) | |||
1011 | if (safe_hardlink_source(inode) || inode_owner_or_capable(inode)) | 1011 | if (safe_hardlink_source(inode) || inode_owner_or_capable(inode)) |
1012 | return 0; | 1012 | return 0; |
1013 | 1013 | ||
1014 | audit_log_link_denied("linkat", link); | 1014 | audit_log_link_denied("linkat"); |
1015 | return -EPERM; | 1015 | return -EPERM; |
1016 | } | 1016 | } |
1017 | 1017 | ||
diff --git a/include/linux/audit.h b/include/linux/audit.h index af410d9fbf2d..75d5b031e802 100644 --- a/include/linux/audit.h +++ b/include/linux/audit.h | |||
@@ -146,8 +146,7 @@ extern void audit_log_d_path(struct audit_buffer *ab, | |||
146 | const struct path *path); | 146 | const struct path *path); |
147 | extern void audit_log_key(struct audit_buffer *ab, | 147 | extern void audit_log_key(struct audit_buffer *ab, |
148 | char *key); | 148 | char *key); |
149 | extern void audit_log_link_denied(const char *operation, | 149 | extern void audit_log_link_denied(const char *operation); |
150 | const struct path *link); | ||
151 | extern void audit_log_lost(const char *message); | 150 | extern void audit_log_lost(const char *message); |
152 | 151 | ||
153 | extern int audit_log_task_context(struct audit_buffer *ab); | 152 | extern int audit_log_task_context(struct audit_buffer *ab); |
@@ -194,8 +193,7 @@ static inline void audit_log_d_path(struct audit_buffer *ab, | |||
194 | { } | 193 | { } |
195 | static inline void audit_log_key(struct audit_buffer *ab, char *key) | 194 | static inline void audit_log_key(struct audit_buffer *ab, char *key) |
196 | { } | 195 | { } |
197 | static inline void audit_log_link_denied(const char *string, | 196 | static inline void audit_log_link_denied(const char *string) |
198 | const struct path *link) | ||
199 | { } | 197 | { } |
200 | static inline int audit_log_task_context(struct audit_buffer *ab) | 198 | static inline int audit_log_task_context(struct audit_buffer *ab) |
201 | { | 199 | { |
diff --git a/kernel/audit.c b/kernel/audit.c index 3f2f143edadf..e8bf8d78ac4a 100644 --- a/kernel/audit.c +++ b/kernel/audit.c | |||
@@ -2308,9 +2308,8 @@ EXPORT_SYMBOL(audit_log_task_info); | |||
2308 | /** | 2308 | /** |
2309 | * audit_log_link_denied - report a link restriction denial | 2309 | * audit_log_link_denied - report a link restriction denial |
2310 | * @operation: specific link operation | 2310 | * @operation: specific link operation |
2311 | * @link: the path that triggered the restriction | ||
2312 | */ | 2311 | */ |
2313 | void audit_log_link_denied(const char *operation, const struct path *link) | 2312 | void audit_log_link_denied(const char *operation) |
2314 | { | 2313 | { |
2315 | struct audit_buffer *ab; | 2314 | struct audit_buffer *ab; |
2316 | 2315 | ||