Commit 90a4dcfd authored by David Howells's avatar David Howells Committed by Greg Kroah-Hartman
Browse files

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

[ Upstream commit 9a059cd5 ]

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: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 92288832
linux-4.9.y Tags unavailable
No related merge requests found
Showing with 2 additions and 2 deletions
+2 -2
......@@ -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;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment