Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94b9d9b7 authored by Richard Guy Briggs's avatar Richard Guy Briggs Committed by Paul Moore
Browse files

audit: remove path param from link denied function 



In commit 45b578fe
("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: default avatarRichard Guy Briggs <rgb@redhat.com>
Signed-off-by: default avatarPaul Moore <paul@paul-moore.com>
parent 45b578fe

fs/namei.c

+2 −2
Original line number Diff line number Diff line
@@ -945,7 +945,7 @@ static inline int may_follow_link(struct nameidata *nd) 
	if (nd->flags & LOOKUP_RCU)

		return -ECHILD;



	audit_log_link_denied("follow_link", &nd->stack[0].link);

	audit_log_link_denied("follow_link");

	return -EACCES;

}
@@ -1011,7 +1011,7 @@ static int may_linkat(struct path *link) 
	if (safe_hardlink_source(inode) || inode_owner_or_capable(inode))

		return 0;



	audit_log_link_denied("linkat", link);

	audit_log_link_denied("linkat");

	return -EPERM;

}

include/linux/audit.h

+2 −4
Original line number Diff line number Diff line
@@ -146,8 +146,7 @@ extern void audit_log_d_path(struct audit_buffer *ab, 
					     const struct path *path);

extern void		    audit_log_key(struct audit_buffer *ab,

					  char *key);

extern void		    audit_log_link_denied(const char *operation,

						  const struct path *link);

extern void		    audit_log_link_denied(const char *operation);

extern void		    audit_log_lost(const char *message);



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, 
{ }

static inline void audit_log_key(struct audit_buffer *ab, char *key)

{ }

static inline void audit_log_link_denied(const char *string,

					 const struct path *link)

static inline void audit_log_link_denied(const char *string)

{ }

static inline int audit_log_task_context(struct audit_buffer *ab)

{

kernel/audit.c

+1 −2
Original line number Diff line number Diff line
@@ -2308,9 +2308,8 @@ EXPORT_SYMBOL(audit_log_task_info); 
/**

 * audit_log_link_denied - report a link restriction denial

 * @operation: specific link operation

 * @link: the path that triggered the restriction

 */

void audit_log_link_denied(const char *operation, const struct path *link)

void audit_log_link_denied(const char *operation)

{

	struct audit_buffer *ab;