diff options
| author | James Morris <james.l.morris@oracle.com> | 2017-10-19 12:28:38 +1100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2017-10-19 12:28:38 +1100 |
| commit | e057de7bfebf7a7091f3446ba3d3f681395f8e5e (patch) | |
| tree | 39e85aa1e658baeb02609212711c7ec76b901564 /crypto/asymmetric_keys/pkcs7_parser.c | |
| parent | 58425dc5a756e7d9cab4d4f0632c0455e1419279 (diff) | |
| parent | 86744701eaebb79b104f1a204a332b2e42725ada (diff) | |
| download | linux-crypto-e057de7bfebf7a7091f3446ba3d3f681395f8e5e.tar.gz linux-crypto-e057de7bfebf7a7091f3446ba3d3f681395f8e5e.zip | |
Merge commit 'tags/keys-fixes-20171018' into fixes-v4.14-rc5
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; |