Browse Source

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

commit 68a1fdbbf8 upstream.

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

Fixes: 99db443506 ("PKCS#7: Appropriately restrict authenticated attributes and content type")
Signed-off-by: Eric Sesterhenn <eric.sesterhenn@x41-dsec.de>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
master
Eric Sesterhenn 4 years ago
committed by Greg Kroah-Hartman
parent
commit
1c33c8f8a7
  1. 3
      crypto/asymmetric_keys/pkcs7_parser.c

3
crypto/asymmetric_keys/pkcs7_parser.c

@ -88,6 +88,9 @@ static int pkcs7_check_authattrs(struct pkcs7_message *msg)
bool want = false;
sinfo = msg->signed_infos;
if (!sinfo)
goto inconsistent;
if (sinfo->authattrs) {
want = true;
msg->have_authattrs = true;

Loading…
Cancel
Save