mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 02:30:34 +02:00 
			
		
		
		
	As said by Linus: A symmetric naming is only helpful if it implies symmetries in use. Otherwise it's actively misleading. In "kzalloc()", the z is meaningful and an important part of what the caller wants. In "kzfree()", the z is actively detrimental, because maybe in the future we really _might_ want to use that "memfill(0xdeadbeef)" or something. The "zero" part of the interface isn't even _relevant_. The main reason that kzfree() exists is to clear sensitive information that should not be leaked to other future users of the same memory objects. Rename kzfree() to kfree_sensitive() to follow the example of the recently added kvfree_sensitive() and make the intention of the API more explicit. In addition, memzero_explicit() is used to clear the memory to make sure that it won't get optimized away by the compiler. The renaming is done by using the command sequence: git grep -w --name-only kzfree |\ xargs sed -i 's/kzfree/kfree_sensitive/' followed by some editing of the kfree_sensitive() kerneldoc and adding a kzfree backward compatibility macro in slab.h. [akpm@linux-foundation.org: fs/crypto/inline_crypt.c needs linux/slab.h] [akpm@linux-foundation.org: fix fs/crypto/inline_crypt.c some more] Suggested-by: Joe Perches <joe@perches.com> Signed-off-by: Waiman Long <longman@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Acked-by: David Howells <dhowells@redhat.com> Acked-by: Michal Hocko <mhocko@suse.com> Acked-by: Johannes Weiner <hannes@cmpxchg.org> Cc: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Cc: James Morris <jmorris@namei.org> Cc: "Serge E. Hallyn" <serge@hallyn.com> Cc: Joe Perches <joe@perches.com> Cc: Matthew Wilcox <willy@infradead.org> Cc: David Rientjes <rientjes@google.com> Cc: Dan Carpenter <dan.carpenter@oracle.com> Cc: "Jason A . Donenfeld" <Jason@zx2c4.com> Link: http://lkml.kernel.org/r/20200616154311.12314-3-longman@redhat.com Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
		
			
				
	
	
		
			207 lines
		
	
	
	
		
			4.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			207 lines
		
	
	
	
		
			4.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
// SPDX-License-Identifier: GPL-2.0-or-later
 | 
						|
/* user_defined.c: user defined key type
 | 
						|
 *
 | 
						|
 * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
 | 
						|
 * Written by David Howells (dhowells@redhat.com)
 | 
						|
 */
 | 
						|
 | 
						|
#include <linux/export.h>
 | 
						|
#include <linux/init.h>
 | 
						|
#include <linux/slab.h>
 | 
						|
#include <linux/seq_file.h>
 | 
						|
#include <linux/err.h>
 | 
						|
#include <keys/user-type.h>
 | 
						|
#include <linux/uaccess.h>
 | 
						|
#include "internal.h"
 | 
						|
 | 
						|
static int logon_vet_description(const char *desc);
 | 
						|
 | 
						|
/*
 | 
						|
 * user defined keys take an arbitrary string as the description and an
 | 
						|
 * arbitrary blob of data as the payload
 | 
						|
 */
 | 
						|
struct key_type key_type_user = {
 | 
						|
	.name			= "user",
 | 
						|
	.preparse		= user_preparse,
 | 
						|
	.free_preparse		= user_free_preparse,
 | 
						|
	.instantiate		= generic_key_instantiate,
 | 
						|
	.update			= user_update,
 | 
						|
	.revoke			= user_revoke,
 | 
						|
	.destroy		= user_destroy,
 | 
						|
	.describe		= user_describe,
 | 
						|
	.read			= user_read,
 | 
						|
};
 | 
						|
 | 
						|
EXPORT_SYMBOL_GPL(key_type_user);
 | 
						|
 | 
						|
/*
 | 
						|
 * This key type is essentially the same as key_type_user, but it does
 | 
						|
 * not define a .read op. This is suitable for storing username and
 | 
						|
 * password pairs in the keyring that you do not want to be readable
 | 
						|
 * from userspace.
 | 
						|
 */
 | 
						|
struct key_type key_type_logon = {
 | 
						|
	.name			= "logon",
 | 
						|
	.preparse		= user_preparse,
 | 
						|
	.free_preparse		= user_free_preparse,
 | 
						|
	.instantiate		= generic_key_instantiate,
 | 
						|
	.update			= user_update,
 | 
						|
	.revoke			= user_revoke,
 | 
						|
	.destroy		= user_destroy,
 | 
						|
	.describe		= user_describe,
 | 
						|
	.vet_description	= logon_vet_description,
 | 
						|
};
 | 
						|
EXPORT_SYMBOL_GPL(key_type_logon);
 | 
						|
 | 
						|
/*
 | 
						|
 * Preparse a user defined key payload
 | 
						|
 */
 | 
						|
int user_preparse(struct key_preparsed_payload *prep)
 | 
						|
{
 | 
						|
	struct user_key_payload *upayload;
 | 
						|
	size_t datalen = prep->datalen;
 | 
						|
 | 
						|
	if (datalen <= 0 || datalen > 32767 || !prep->data)
 | 
						|
		return -EINVAL;
 | 
						|
 | 
						|
	upayload = kmalloc(sizeof(*upayload) + datalen, GFP_KERNEL);
 | 
						|
	if (!upayload)
 | 
						|
		return -ENOMEM;
 | 
						|
 | 
						|
	/* attach the data */
 | 
						|
	prep->quotalen = datalen;
 | 
						|
	prep->payload.data[0] = upayload;
 | 
						|
	upayload->datalen = datalen;
 | 
						|
	memcpy(upayload->data, prep->data, datalen);
 | 
						|
	return 0;
 | 
						|
}
 | 
						|
EXPORT_SYMBOL_GPL(user_preparse);
 | 
						|
 | 
						|
/*
 | 
						|
 * Free a preparse of a user defined key payload
 | 
						|
 */
 | 
						|
void user_free_preparse(struct key_preparsed_payload *prep)
 | 
						|
{
 | 
						|
	kfree_sensitive(prep->payload.data[0]);
 | 
						|
}
 | 
						|
EXPORT_SYMBOL_GPL(user_free_preparse);
 | 
						|
 | 
						|
static void user_free_payload_rcu(struct rcu_head *head)
 | 
						|
{
 | 
						|
	struct user_key_payload *payload;
 | 
						|
 | 
						|
	payload = container_of(head, struct user_key_payload, rcu);
 | 
						|
	kfree_sensitive(payload);
 | 
						|
}
 | 
						|
 | 
						|
/*
 | 
						|
 * update a user defined key
 | 
						|
 * - the key's semaphore is write-locked
 | 
						|
 */
 | 
						|
int user_update(struct key *key, struct key_preparsed_payload *prep)
 | 
						|
{
 | 
						|
	struct user_key_payload *zap = NULL;
 | 
						|
	int ret;
 | 
						|
 | 
						|
	/* check the quota and attach the new data */
 | 
						|
	ret = key_payload_reserve(key, prep->datalen);
 | 
						|
	if (ret < 0)
 | 
						|
		return ret;
 | 
						|
 | 
						|
	/* attach the new data, displacing the old */
 | 
						|
	key->expiry = prep->expiry;
 | 
						|
	if (key_is_positive(key))
 | 
						|
		zap = dereference_key_locked(key);
 | 
						|
	rcu_assign_keypointer(key, prep->payload.data[0]);
 | 
						|
	prep->payload.data[0] = NULL;
 | 
						|
 | 
						|
	if (zap)
 | 
						|
		call_rcu(&zap->rcu, user_free_payload_rcu);
 | 
						|
	return ret;
 | 
						|
}
 | 
						|
EXPORT_SYMBOL_GPL(user_update);
 | 
						|
 | 
						|
/*
 | 
						|
 * dispose of the links from a revoked keyring
 | 
						|
 * - called with the key sem write-locked
 | 
						|
 */
 | 
						|
void user_revoke(struct key *key)
 | 
						|
{
 | 
						|
	struct user_key_payload *upayload = user_key_payload_locked(key);
 | 
						|
 | 
						|
	/* clear the quota */
 | 
						|
	key_payload_reserve(key, 0);
 | 
						|
 | 
						|
	if (upayload) {
 | 
						|
		rcu_assign_keypointer(key, NULL);
 | 
						|
		call_rcu(&upayload->rcu, user_free_payload_rcu);
 | 
						|
	}
 | 
						|
}
 | 
						|
 | 
						|
EXPORT_SYMBOL(user_revoke);
 | 
						|
 | 
						|
/*
 | 
						|
 * dispose of the data dangling from the corpse of a user key
 | 
						|
 */
 | 
						|
void user_destroy(struct key *key)
 | 
						|
{
 | 
						|
	struct user_key_payload *upayload = key->payload.data[0];
 | 
						|
 | 
						|
	kfree_sensitive(upayload);
 | 
						|
}
 | 
						|
 | 
						|
EXPORT_SYMBOL_GPL(user_destroy);
 | 
						|
 | 
						|
/*
 | 
						|
 * describe the user key
 | 
						|
 */
 | 
						|
void user_describe(const struct key *key, struct seq_file *m)
 | 
						|
{
 | 
						|
	seq_puts(m, key->description);
 | 
						|
	if (key_is_positive(key))
 | 
						|
		seq_printf(m, ": %u", key->datalen);
 | 
						|
}
 | 
						|
 | 
						|
EXPORT_SYMBOL_GPL(user_describe);
 | 
						|
 | 
						|
/*
 | 
						|
 * read the key data
 | 
						|
 * - the key's semaphore is read-locked
 | 
						|
 */
 | 
						|
long user_read(const struct key *key, char *buffer, size_t buflen)
 | 
						|
{
 | 
						|
	const struct user_key_payload *upayload;
 | 
						|
	long ret;
 | 
						|
 | 
						|
	upayload = user_key_payload_locked(key);
 | 
						|
	ret = upayload->datalen;
 | 
						|
 | 
						|
	/* we can return the data as is */
 | 
						|
	if (buffer && buflen > 0) {
 | 
						|
		if (buflen > upayload->datalen)
 | 
						|
			buflen = upayload->datalen;
 | 
						|
 | 
						|
		memcpy(buffer, upayload->data, buflen);
 | 
						|
	}
 | 
						|
 | 
						|
	return ret;
 | 
						|
}
 | 
						|
 | 
						|
EXPORT_SYMBOL_GPL(user_read);
 | 
						|
 | 
						|
/* Vet the description for a "logon" key */
 | 
						|
static int logon_vet_description(const char *desc)
 | 
						|
{
 | 
						|
	char *p;
 | 
						|
 | 
						|
	/* require a "qualified" description string */
 | 
						|
	p = strchr(desc, ':');
 | 
						|
	if (!p)
 | 
						|
		return -EINVAL;
 | 
						|
 | 
						|
	/* also reject description with ':' as first char */
 | 
						|
	if (p == desc)
 | 
						|
		return -EINVAL;
 | 
						|
 | 
						|
	return 0;
 | 
						|
}
 |