[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20140515145122.29177.65285.stgit@warthog.procyon.org.uk>
Date: Thu, 15 May 2014 15:51:22 +0100
From: David Howells <dhowells@...hat.com>
To: netdev@...r.kernel.org
Cc: Nathaniel Wesley Filardo <nwf@...jhu.edu>,
linux-afs@...ts.infradead.org, linux-kernel@...r.kernel.org
Subject: [PATCH] af_rxrpc: Fix XDR length check in rxrpc key demarshalling.
From: Nathaniel W Filardo <nwf@...jhu.edu>
There may be padding on the ticket contained in the key payload, so just ensure
that the claimed token length is large enough, rather than exactly the right
size.
Signed-off-by: Nathaniel Wesley Filardo <nwf@...jhu.edu>
Signed-off-by: David Howells <dhowells@...hat.com>
---
net/rxrpc/ar-key.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/rxrpc/ar-key.c b/net/rxrpc/ar-key.c
index 7633a752c65e..0ad080790a32 100644
--- a/net/rxrpc/ar-key.c
+++ b/net/rxrpc/ar-key.c
@@ -99,7 +99,7 @@ static int rxrpc_instantiate_xdr_rxkad(struct key *key, const __be32 *xdr,
_debug("tktlen: %x", tktlen);
if (tktlen > AFSTOKEN_RK_TIX_MAX)
return -EKEYREJECTED;
- if (8 * 4 + tktlen != toklen)
+ if (toklen < 8 * 4 + tktlen)
return -EKEYREJECTED;
plen = sizeof(*token) + sizeof(*token->kad) + tktlen;
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists