Commit 4a0b2759 authored Sep 08, 2020 by David Howells Committed by Greg Kroah-Hartman Oct 14, 2020

rxrpc: Downgrade the BUG() for unsupported token type in rxrpc_read()



[ Upstream commit 9a059cd5ca7d9c5c4ca5a6e755cf72f230176b6a ]

If rxrpc_read() (which allows KEYCTL_READ to read a key), sees a token of a
type it doesn't recognise, it can BUG in a couple of places, which is
unnecessary as it can easily get back to userspace.

Fix this to print an error message instead.

Fixes: 99455153 ("RxRPC: Parse security index 5 keys (Kerberos 5)")
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 5de841c5

net/rxrpc/key.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1110,7 +1110,8 @@ static long rxrpc_read(const struct key *key,
		break;

		default: /* we have a ticket we can't encode */
		BUG();
		pr_err("Unsupported key token type (%u)\n",
		token->security_index);
		continue;
		}

		@@ -1226,7 +1227,6 @@ static long rxrpc_read(const struct key *key,
		break;

		default:
		BUG();
		break;
		}