Commit d52e419a authored by David Howells's avatar David Howells Committed by Jakub Kicinski

rxrpc: Fix handling of an unsupported token type in rxrpc_read()

Clang static analysis reports the following:

net/rxrpc/key.c:657:11: warning: Assigned value is garbage or undefined
                toksize = toksizes[tok++];
                        ^ ~~~~~~~~~~~~~~~

rxrpc_read() contains two consecutive loops.  The first loop calculates the
token sizes and stores the results in toksizes[] and the second one uses
the array.  When there is an error in identifying the token in the first
loop, the token is skipped, no change is made to the toksizes[] array.
When the same error happens in the second loop, the token is not skipped.
This will cause the toksizes[] array to be out of step and will overrun
past the calculated sizes.

Fix this by making both loops log a message and return an error in this
case.  This should only happen if a new token type is incompletely
implemented, so it should normally be impossible to trigger this.

Fixes: 9a059cd5 ("rxrpc: Downgrade the BUG() for unsupported token type in rxrpc_read()")
Reported-by: default avatarTom Rix <trix@redhat.com>
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Reviewed-by: default avatarTom Rix <trix@redhat.com>
Link: https://lore.kernel.org/r/161046503122.2445787.16714129930607546635.stgit@warthog.procyon.org.ukSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent c8a8ead0
...@@ -598,7 +598,7 @@ static long rxrpc_read(const struct key *key, ...@@ -598,7 +598,7 @@ static long rxrpc_read(const struct key *key,
default: /* we have a ticket we can't encode */ default: /* we have a ticket we can't encode */
pr_err("Unsupported key token type (%u)\n", pr_err("Unsupported key token type (%u)\n",
token->security_index); token->security_index);
continue; return -ENOPKG;
} }
_debug("token[%u]: toksize=%u", ntoks, toksize); _debug("token[%u]: toksize=%u", ntoks, toksize);
...@@ -674,7 +674,9 @@ static long rxrpc_read(const struct key *key, ...@@ -674,7 +674,9 @@ static long rxrpc_read(const struct key *key,
break; break;
default: default:
break; pr_err("Unsupported key token type (%u)\n",
token->security_index);
return -ENOPKG;
} }
ASSERTCMP((unsigned long)xdr - (unsigned long)oldxdr, ==, ASSERTCMP((unsigned long)xdr - (unsigned long)oldxdr, ==,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment