Commit b3816cf8 authored by Paul Moore's avatar Paul Moore
Browse files

lsm: fix a badly named parameter in security_get_getsecurity() 



There is no good reason for why the "_buffer" parameter needs an
underscore, get rid of it.

Signed-off-by: default avatarPaul Moore <paul@paul-moore.com>
parent 1e2523d7

include/linux/lsm_hook_defs.h

+1 −1
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ LSM_HOOK(int, 0, key_alloc, struct key *key, const struct cred *cred, 
LSM_HOOK(void, LSM_RET_VOID, key_free, struct key *key)

LSM_HOOK(int, 0, key_permission, key_ref_t key_ref, const struct cred *cred,

	 enum key_need_perm need_perm)

LSM_HOOK(int, 0, key_getsecurity, struct key *key, char **_buffer)

LSM_HOOK(int, 0, key_getsecurity, struct key *key, char **buffer)

#endif /* CONFIG_KEYS */



#ifdef CONFIG_AUDIT

security/security.c

+5 −5
Original line number Diff line number Diff line
@@ -4981,20 +4981,20 @@ int security_key_permission(key_ref_t key_ref, const struct cred *cred, 
/**

 * security_key_getsecurity() - Get the key's security label

 * @key: key

 * @_buffer: security label buffer

 * @buffer: security label buffer

 *

 * Get a textual representation of the security context attached to a key for

 * the purposes of honouring KEYCTL_GETSECURITY.  This function allocates the

 * storage for the NUL-terminated string and the caller should free it.

 *

 * Return: Returns the length of @_buffer (including terminating NUL) or -ve if

 * Return: Returns the length of @buffer (including terminating NUL) or -ve if

 *         an error occurs.  May also return 0 (and a NULL buffer pointer) if

 *         there is no security label assigned to the key.

 */

int security_key_getsecurity(struct key *key, char **_buffer)

int security_key_getsecurity(struct key *key, char **buffer)

{

	*_buffer = NULL;

	return call_int_hook(key_getsecurity, 0, key, _buffer);

	*buffer = NULL;

	return call_int_hook(key_getsecurity, 0, key, buffer);

}

#endif	/* CONFIG_KEYS */