redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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

[ Upstream commit 9a059cd5ca ]

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: 99455153d0 ("RxRPC: Parse security index 5 keys (Kerberos 5)")
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
5.4-rM2-2.2.x-imx-squashed
David Howells 2020-09-08 22:09:04 +01:00 committed by Greg Kroah-Hartman
parent 7e1f39b5c1
commit 422f5c5d3e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/rxrpc/key.c
View File

@ -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;
}