wonderful-mobile/exynos-linux-stable
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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: 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>
This commit is contained in:
Eric Sesterhenn 2017-10-08 20:02:32 +02:00 • committed by Greg Kroah-Hartman
parent da0c7503c0
commit 1c33c8f8a7
1 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
crypto/asymmetric_keys/pkcs7_parser.c
View file

@ -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;