Skip to contentSkip to conversation

Patch "pkcs7: Prevent NULL pointer dereference, since sinfo is not always set." has been added to the 4.13-stable tree

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

Subsystems (3)
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

pkcs7: Prevent NULL pointer dereference, since sinfo is not always set.

to the 4.13-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:
pkcs7-prevent-null-pointer-dereference-since-sinfo-is-not-always-set.patch
and it can be found in the queue-4.13 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 68a1fdbbf8bd3378325e45c19e167a165f9ffc3a Mon Sep 17 00:00:00 2001

From: Eric Sesterhenn <[email protected]>
Date: Sun, 8 Oct 2017 20:02:32 +0200
Subject: pkcs7: Prevent NULL pointer dereference, since sinfo is not always set.

From: Eric Sesterhenn <[email protected]>

commit 68a1fdbbf8bd3378325e45c19e167a165f9ffc3a upstream.

The ASN.1 parser does not necessarily set the sinfo field, this patch prevents a NULL pointer dereference on broken input.

Fixes 99db44350672 ("PKCS#7: Appropriately restrict authenticated attributes and content type")
---
 crypto/asymmetric_keys/pkcs7_parser.c |    3 +++
 1 file changed, 3 insertions(+)
crypto/asymmetric_keys/pkcs7_parser.c +3 -0
@@ -88,6 +88,9 @@ static int pkcs7_check_authattrs(struct
 	bool want = false;
 
 	sinfo = msg->signed_infos;
+	if (!sinfo)
+		goto inconsistent;
+
 	if (sinfo->authattrs) {
 		want = true;
 		msg->have_authattrs = true;

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

queue-4.13/pkcs7-prevent-null-pointer-dereference-since-sinfo-is-not-always-set.patch