mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-22 09:22:37 +00:00
0837e49ab3
rcu_dereference_key() and user_key_payload() are currently being used in two different, incompatible ways: (1) As a wrapper to rcu_dereference() - when only the RCU read lock used to protect the key. (2) As a wrapper to rcu_dereference_protected() - when the key semaphor is used to protect the key and the may be being modified. Fix this by splitting both of the key wrappers to produce: (1) RCU accessors for keys when caller has the key semaphore locked: dereference_key_locked() user_key_payload_locked() (2) RCU accessors for keys when caller holds the RCU read lock: dereference_key_rcu() user_key_payload_rcu() This should fix following warning in the NFS idmapper =============================== [ INFO: suspicious RCU usage. ] 4.10.0 #1 Tainted: G W ------------------------------- ./include/keys/user-type.h:53 suspicious rcu_dereference_protected() usage! other info that might help us debug this: rcu_scheduler_active = 2, debug_locks = 0 1 lock held by mount.nfs/5987: #0: (rcu_read_lock){......}, at: [<d000000002527abc>] nfs_idmap_get_key+0x15c/0x420 [nfsv4] stack backtrace: CPU: 1 PID: 5987 Comm: mount.nfs Tainted: G W 4.10.0 #1 Call Trace: dump_stack+0xe8/0x154 (unreliable) lockdep_rcu_suspicious+0x140/0x190 nfs_idmap_get_key+0x380/0x420 [nfsv4] nfs_map_name_to_uid+0x2a0/0x3b0 [nfsv4] decode_getfattr_attrs+0xfac/0x16b0 [nfsv4] decode_getfattr_generic.constprop.106+0xbc/0x150 [nfsv4] nfs4_xdr_dec_lookup_root+0xac/0xb0 [nfsv4] rpcauth_unwrap_resp+0xe8/0x140 [sunrpc] call_decode+0x29c/0x910 [sunrpc] __rpc_execute+0x140/0x8f0 [sunrpc] rpc_run_task+0x170/0x200 [sunrpc] nfs4_call_sync_sequence+0x68/0xa0 [nfsv4] _nfs4_lookup_root.isra.44+0xd0/0xf0 [nfsv4] nfs4_lookup_root+0xe0/0x350 [nfsv4] nfs4_lookup_root_sec+0x70/0xa0 [nfsv4] nfs4_find_root_sec+0xc4/0x100 [nfsv4] nfs4_proc_get_rootfh+0x5c/0xf0 [nfsv4] nfs4_get_rootfh+0x6c/0x190 [nfsv4] nfs4_server_common_setup+0xc4/0x260 [nfsv4] nfs4_create_server+0x278/0x3c0 [nfsv4] nfs4_remote_mount+0x50/0xb0 [nfsv4] mount_fs+0x74/0x210 vfs_kern_mount+0x78/0x220 nfs_do_root_mount+0xb0/0x140 [nfsv4] nfs4_try_mount+0x60/0x100 [nfsv4] nfs_fs_mount+0x5ec/0xda0 [nfs] mount_fs+0x74/0x210 vfs_kern_mount+0x78/0x220 do_mount+0x254/0xf70 SyS_mount+0x94/0x100 system_call+0x38/0xe0 Reported-by: Jan Stancek <jstancek@redhat.com> Signed-off-by: David Howells <dhowells@redhat.com> Tested-by: Jan Stancek <jstancek@redhat.com> Signed-off-by: James Morris <james.l.morris@oracle.com>
205 lines
4.6 KiB
C
205 lines
4.6 KiB
C
/* user_defined.c: user defined key type
|
|
*
|
|
* Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
|
|
* Written by David Howells (dhowells@redhat.com)
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version
|
|
* 2 of the License, or (at your option) any later version.
|
|
*/
|
|
|
|
#include <linux/module.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(prep->payload.data[0]);
|
|
}
|
|
EXPORT_SYMBOL_GPL(user_free_preparse);
|
|
|
|
/*
|
|
* 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 (!test_bit(KEY_FLAG_NEGATIVE, &key->flags))
|
|
zap = dereference_key_locked(key);
|
|
rcu_assign_keypointer(key, prep->payload.data[0]);
|
|
prep->payload.data[0] = NULL;
|
|
|
|
if (zap)
|
|
kfree_rcu(zap, 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);
|
|
kfree_rcu(upayload, 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(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_instantiated(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 __user *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;
|
|
|
|
if (copy_to_user(buffer, upayload->data, buflen) != 0)
|
|
ret = -EFAULT;
|
|
}
|
|
|
|
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;
|
|
}
|