diff options
author | David Howells <dhowells@redhat.com> | 2020-09-09 00:09:04 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-10-14 11:33:05 +0300 |
commit | 422f5c5d3ef9eb44eaac710504593da733aca985 (patch) | |
tree | b4c4b0c0daa18572049c007613bd81f1d9471480 | |
parent | 7e1f39b5c1d5ba70a70844658cbde0d0ab8f7e1d (diff) | |
download | linux-422f5c5d3ef9eb44eaac710504593da733aca985.tar.xz |
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: 99455153d067 ("RxRPC: Parse security index 5 keys (Kerberos 5)")
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r-- | net/rxrpc/key.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/rxrpc/key.c b/net/rxrpc/key.c index d77e89766406..32f46edcf7c6 100644 --- a/net/rxrpc/key.c +++ b/net/rxrpc/key.c @@ -1108,7 +1108,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; } @@ -1224,7 +1225,6 @@ static long rxrpc_read(const struct key *key, break; default: - BUG(); break; } |