Skip to contentSkip to conversation

Patch "lib/digsig: fix dereference of NULL user_key_payload" has been added to the 3.18-stable tree

PATCH [email protected] 1 participant 1 message Oct 24, 2017

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

lib/digsig: fix dereference of NULL user_key_payload

to the 3.18-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
lib-digsig-fix-dereference-of-null-user_key_payload.patch
and it can be found in the queue-3.18 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 192cabd6a296cbc57b3d8c05c4c89d87fc102506 Mon Sep 17 00:00:00 2001

From: Eric Biggers <[email protected]>
Date: Mon, 9 Oct 2017 12:43:20 -0700
Subject: lib/digsig: fix dereference of NULL user_key_payload

From: Eric Biggers <[email protected]>

commit 192cabd6a296cbc57b3d8c05c4c89d87fc102506 upstream.

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 051dbb918c7f ("crypto: digital signature verification support")
Cc Dmitry Kasatkin <[email protected]>
---
 lib/digsig.c |    6 ++++++
 1 file changed, 6 insertions(+)
lib/digsig.c +6 -0
@@ -86,6 +86,12 @@ static int digsig_verify_rsa(struct key
 	down_read(&key->sem);
 	ukp = key->payload.data;
 
+	if (!ukp) {
+		/* key was revoked before we acquired its semaphore */
+		err = -EKEYREVOKED;
+		goto err1;
+	}
+
 	if (ukp->datalen < sizeof(*pkh))
 		goto err1;
 

Patches currently in stable-queue which might be from [email protected] are

queue-3.18/lib-digsig-fix-dereference-of-null-user_key_payload.patch queue-3.18/keys-encrypted-fix-dereference-of-null-user_key_payload.patch queue-3.18/keys-don-t-let-add_key-update-an-uninstantiated-key.patch