Commit b1127085 authored Nov 06, 2017 by Eric Biggers Committed by Ilya Dryomov Nov 13, 2017

libceph: don't WARN() if user tries to add invalid key



The WARN_ON(!key->len) in set_secret() in net/ceph/crypto.c is hit if a
user tries to add a key of type "ceph" with an invalid payload as
follows (assuming CONFIG_CEPH_LIB=y):

    echo -e -n '\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' \
	| keyctl padd ceph desc @s

This can be hit by fuzzers.  As this is merely bad input and not a
kernel bug, replace the WARN_ON() with return -EINVAL.

Fixes: 7af3ea18 ("libceph: stop allocating a new cipher on every crypto request")
Cc: <stable@vger.kernel.org> # v4.10+
Signed-off-by: Eric Biggers <ebiggers@google.com>
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>

parent 7c084289

net/ceph/crypto.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -37,7 +37,9 @@ static int set_secret(struct ceph_crypto_key key, void buf)
		return -ENOTSUPP;
		}

		WARN_ON(!key->len);
		if (!key->len)
		return -EINVAL;

		key->key = kmemdup(buf, key->len, GFP_NOIO);
		if (!key->key) {
		ret = -ENOMEM;

Admin message