Skip to content

Commit

Permalink
lib/digsig: fix dereference of NULL user_key_payload
Browse files Browse the repository at this point in the history
digsig_verify() requests a user key, then accesses its payload.
However, a revoked key has a NULL payload, and we failed to check for
this.  request_key() *does* skip revoked keys, but there is still a
window where the key can be revoked before we acquire its semaphore.

Fix it by checking for a NULL payload, treating it like a key which was
already revoked at the time it was requested.

Fixes: 051dbb9 ("crypto: digital signature verification support")
Reviewed-by: James Morris <[email protected]>
Cc: <[email protected]>    [v3.3+]
Cc: Dmitry Kasatkin <[email protected]>
Signed-off-by: Eric Biggers <[email protected]>
Signed-off-by: David Howells <[email protected]>
  • Loading branch information
ebiggers authored and dhowells committed Oct 12, 2017
1 parent d124b2c commit 192cabd
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions lib/digsig.c
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,12 @@ static int digsig_verify_rsa(struct key *key,
down_read(&key->sem);
ukp = user_key_payload_locked(key);

if (!ukp) {
/* key was revoked before we acquired its semaphore */
err = -EKEYREVOKED;
goto err1;
}

if (ukp->datalen < sizeof(*pkh))
goto err1;

Expand Down

0 comments on commit 192cabd

Please sign in to comment.