rxrpc: Downgrade the BUG() for unsupported token type in rxrpc_read()
authorDavid Howells <dhowells@redhat.com>
Tue, 8 Sep 2020 21:09:04 +0000 (22:09 +0100)
committerDavid Howells <dhowells@redhat.com>
Mon, 5 Oct 2020 15:33:37 +0000 (16:33 +0100)
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>
net/rxrpc/key.c

index 8f7d7a6..c668e4b 100644 (file)
@@ -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;
                }