From: David Howells <dhowells@redhat.com>
Date: Tue, 8 Sep 2020 21:09:04 +0000 (+0100)
Subject: rxrpc: Downgrade the BUG() for unsupported token type in rxrpc_read()
X-Git-Tag: v4.9.239~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=90a4dcfd864ca1854ff32e7feab457e786877091;p=platform%2Fkernel%2Flinux-amlogic.git

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

[ Upstream commit 9a059cd5ca7d9c5c4ca5a6e755cf72f230176b6a ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/net/rxrpc/key.c b/net/rxrpc/key.c
index fd9260620824..01d2d40ef21c 100644
--- a/net/rxrpc/key.c
+++ b/net/rxrpc/key.c
@@ -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;
 		}