diff options
author | Juergen Gross <jgross@suse.com> | 2017-11-13 10:24:50 +0100 |
---|---|---|
committer | Juergen Gross <jgross@suse.com> | 2017-11-13 10:24:50 +0100 |
commit | 40248a5f572a9ee5602fb61b33ddcc7de3b4cf5b (patch) | |
tree | b443b237fa80f2cc8ca8510b63aaa4861ba3ea7a /crypto/asymmetric_keys/pkcs7_parser.c | |
parent | 4f673910a79f5cb0e7dd87bf807eebb24834cea3 (diff) | |
parent | 37d98457e3c414a1673bf5dce97eb4c79b5cff25 (diff) | |
download | linux-crypto-40248a5f572a9ee5602fb61b33ddcc7de3b4cf5b.tar.gz linux-crypto-40248a5f572a9ee5602fb61b33ddcc7de3b4cf5b.zip |
Merge tag 'v4.14' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Linux 4.14
Diffstat (limited to 'crypto/asymmetric_keys/pkcs7_parser.c')
-rw-r--r-- | crypto/asymmetric_keys/pkcs7_parser.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/crypto/asymmetric_keys/pkcs7_parser.c b/crypto/asymmetric_keys/pkcs7_parser.c index af4cd864..d140d8bb 100644 --- a/crypto/asymmetric_keys/pkcs7_parser.c +++ b/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; |