9f35a33b8d
Fix a NULL pointer deref in the user-defined key type whereby updating a negative key into a fully instantiated key will cause an oops to occur when the code attempts to free the non-existent old payload. This results in an oops that looks something like the following: BUG: unable to handle kernel NULL pointer dereference at 0000000000000008 IP: [<ffffffff81085fa1>] __call_rcu+0x11/0x13e PGD 3391d067 PUD 3894a067 PMD 0 Oops: 0002 [#1] SMP CPU 1 Pid: 4354, comm: keyctl Not tainted 3.1.0-fsdevel+ #1140 /DG965RY RIP: 0010:[<ffffffff81085fa1>] [<ffffffff81085fa1>] __call_rcu+0x11/0x13e RSP: 0018:ffff88003d591df8 EFLAGS: 00010246 RAX: 0000000000000000 RBX: 0000000000000000 RCX: 000000000000006e RDX: ffffffff8161d0c0 RSI: 0000000000000000 RDI: 0000000000000000 RBP: ffff88003d591e18 R08: 0000000000000000 R09: ffffffff8152fa6c R10: 0000000000000000 R11: 0000000000000300 R12: ffff88003b8f9538 R13: ffffffff8161d0c0 R14: ffff88003b8f9d50 R15: ffff88003c69f908 FS: 00007f97eb18c720(0000) GS:ffff88003bd00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000008 CR3: 000000003d47a000 CR4: 00000000000006e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 Process keyctl (pid: 4354, threadinfo ffff88003d590000, task ffff88003c78a040) Stack: ffff88003e0ffde0 ffff88003b8f9538 0000000000000001 ffff88003b8f9d50 ffff88003d591e28 ffffffff810860f0 ffff88003d591e68 ffffffff8117bfea ffff88003d591e68 ffffffff00000000 ffff88003e0ffde1 ffff88003e0ffde0 Call Trace: [<ffffffff810860f0>] call_rcu_sched+0x10/0x12 [<ffffffff8117bfea>] user_update+0x8d/0xa2 [<ffffffff8117723a>] key_create_or_update+0x236/0x270 [<ffffffff811789b1>] sys_add_key+0x123/0x17e [<ffffffff813b84bb>] system_call_fastpath+0x16/0x1b Signed-off-by: David Howells <dhowells@redhat.com> Acked-by: Jeff Layton <jlayton@redhat.com> Acked-by: Neil Horman <nhorman@redhat.com> Acked-by: Steve Dickson <steved@redhat.com> Acked-by: James Morris <jmorris@namei.org> Cc: stable@kernel.org Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
191 lines
3.9 KiB
C
191 lines
3.9 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 <asm/uaccess.h>
|
|
#include "internal.h"
|
|
|
|
/*
|
|
* 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",
|
|
.instantiate = user_instantiate,
|
|
.update = user_update,
|
|
.match = user_match,
|
|
.revoke = user_revoke,
|
|
.destroy = user_destroy,
|
|
.describe = user_describe,
|
|
.read = user_read,
|
|
};
|
|
|
|
EXPORT_SYMBOL_GPL(key_type_user);
|
|
|
|
/*
|
|
* instantiate a user defined key
|
|
*/
|
|
int user_instantiate(struct key *key, const void *data, size_t datalen)
|
|
{
|
|
struct user_key_payload *upayload;
|
|
int ret;
|
|
|
|
ret = -EINVAL;
|
|
if (datalen <= 0 || datalen > 32767 || !data)
|
|
goto error;
|
|
|
|
ret = key_payload_reserve(key, datalen);
|
|
if (ret < 0)
|
|
goto error;
|
|
|
|
ret = -ENOMEM;
|
|
upayload = kmalloc(sizeof(*upayload) + datalen, GFP_KERNEL);
|
|
if (!upayload)
|
|
goto error;
|
|
|
|
/* attach the data */
|
|
upayload->datalen = datalen;
|
|
memcpy(upayload->data, data, datalen);
|
|
rcu_assign_pointer(key->payload.data, upayload);
|
|
ret = 0;
|
|
|
|
error:
|
|
return ret;
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(user_instantiate);
|
|
|
|
/*
|
|
* update a user defined key
|
|
* - the key's semaphore is write-locked
|
|
*/
|
|
int user_update(struct key *key, const void *data, size_t datalen)
|
|
{
|
|
struct user_key_payload *upayload, *zap;
|
|
int ret;
|
|
|
|
ret = -EINVAL;
|
|
if (datalen <= 0 || datalen > 32767 || !data)
|
|
goto error;
|
|
|
|
/* construct a replacement payload */
|
|
ret = -ENOMEM;
|
|
upayload = kmalloc(sizeof(*upayload) + datalen, GFP_KERNEL);
|
|
if (!upayload)
|
|
goto error;
|
|
|
|
upayload->datalen = datalen;
|
|
memcpy(upayload->data, data, datalen);
|
|
|
|
/* check the quota and attach the new data */
|
|
zap = upayload;
|
|
|
|
ret = key_payload_reserve(key, datalen);
|
|
|
|
if (ret == 0) {
|
|
/* attach the new data, displacing the old */
|
|
zap = key->payload.data;
|
|
rcu_assign_pointer(key->payload.data, upayload);
|
|
key->expiry = 0;
|
|
}
|
|
|
|
if (zap)
|
|
kfree_rcu(zap, rcu);
|
|
|
|
error:
|
|
return ret;
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(user_update);
|
|
|
|
/*
|
|
* match users on their name
|
|
*/
|
|
int user_match(const struct key *key, const void *description)
|
|
{
|
|
return strcmp(key->description, description) == 0;
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(user_match);
|
|
|
|
/*
|
|
* 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 = key->payload.data;
|
|
|
|
/* clear the quota */
|
|
key_payload_reserve(key, 0);
|
|
|
|
if (upayload) {
|
|
rcu_assign_pointer(key->payload.data, 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;
|
|
|
|
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)
|
|
{
|
|
struct user_key_payload *upayload;
|
|
long ret;
|
|
|
|
upayload = rcu_dereference_key(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);
|