diff options
| author | David Howells <dhowells@redhat.com> | 2020-09-08 22:09:04 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2020-10-05 16:33:37 +0100 |
| commit | 9a059cd5ca7d9c5c4ca5a6e755cf72f230176b6a (patch) | |
| tree | 10d74c09539ed93ee542ead429e44f1509e34f00 | |
| parent | 56305118e05b2db8d0395bba640ac9a3aee92624 (diff) | |
| download | lwn-9a059cd5ca7d9c5c4ca5a6e755cf72f230176b6a.tar.gz lwn-9a059cd5ca7d9c5c4ca5a6e755cf72f230176b6a.zip | |
rxrpc: Downgrade the BUG() for unsupported token type in rxrpc_read()
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>
| -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 8f7d7a6187db..c668e4b7dbff 100644 --- a/net/rxrpc/key.c +++ b/net/rxrpc/key.c @@ -1107,7 +1107,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; } @@ -1223,7 +1224,6 @@ static long rxrpc_read(const struct key *key, break; default: - BUG(); break; } |