diff options
| author | David Howells <dhowells@redhat.com> | 2020-09-08 22:09:04 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-10-14 09:48:17 +0200 |
| commit | 90a4dcfd864ca1854ff32e7feab457e786877091 (patch) | |
| tree | ab6434f0affa589fecd7d01ee83dcf81625147e6 /net/rxrpc | |
| parent | 922888326eb52239f3a76bbb7aa3f1fb952c0076 (diff) | |
| download | linux-rt-90a4dcfd864ca1854ff32e7feab457e786877091.tar.gz | |
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>
Diffstat (limited to 'net/rxrpc')
| -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 fd9260620824..01d2d40ef21c 100644 --- a/net/rxrpc/key.c +++ b/net/rxrpc/key.c @@ -1104,7 +1104,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; } @@ -1225,7 +1226,6 @@ static long rxrpc_read(const struct key *key, break; default: - BUG(); break; } |