Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 68a1fdbb authored by Eric Sesterhenn's avatar Eric Sesterhenn Committed by David Howells
Browse files

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



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

Fixes: 99db4435 ("PKCS#7: Appropriately restrict authenticated attributes and content type")
Signed-off-by: default avatarEric Sesterhenn <eric.sesterhenn@x41-dsec.de>
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
cc: stable@vger.kernel.org # 4.3+
parent ab5c69f0

crypto/asymmetric_keys/pkcs7_parser.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -88,6 +88,9 @@ static int pkcs7_check_authattrs(struct pkcs7_message *msg) 
	bool want = false;

	bool want = false;





	sinfo = msg->signed_infos;

	sinfo = msg->signed_infos;

	if (!sinfo)

		goto inconsistent;



	if (sinfo->authattrs) {

	if (sinfo->authattrs) {

		want = true;

		want = true;

		msg->have_authattrs = true;

		msg->have_authattrs = true;