redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

pkcs7: return correct error code if pkcs7_check_authattrs() fails 

If pkcs7_check_authattrs() returns an error code, we should pass that
error code on, rather than using ENOMEM.

Fixes: 99db443506 ("PKCS#7: Appropriately restrict authenticated attributes and content type")
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Reviewed-by: James Morris <james.l.morris@oracle.com>
hifive-unleashed-5.1
Eric Biggers 2017-12-08 15:13:28 +00:00 committed by David Howells
parent 8dfd2f22d3
commit 8ecb506d34
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crypto/asymmetric_keys/pkcs7_parser.c
View File

@ -148,8 +148,10 @@ struct pkcs7_message *pkcs7_parse_message(const void *data, size_t datalen)
}
ret = pkcs7_check_authattrs(ctx->msg);
if (ret < 0)
if (ret < 0) {
msg = ERR_PTR(ret);
goto out;
}
msg = ctx->msg;
ctx->msg = NULL;