Skip to content

Commit

Permalink
rxrpc: Downgrade the BUG() for unsupported token type in rxrpc_read()
Browse files Browse the repository at this point in the history
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: 9945515 ("RxRPC: Parse security index 5 keys (Kerberos 5)")
Signed-off-by: David Howells <dhowells@redhat.com>
  • Loading branch information
David Howells committed Oct 5, 2020
1 parent 5630511 commit 9a059cd
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions net/rxrpc/key.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -1223,7 +1224,6 @@ static long rxrpc_read(const struct key *key,
break;

default:
BUG();
break;
}

Expand Down

0 comments on commit 9a059cd

Please sign in to comment.