diff options
| author | Juergen Gross <jgross@suse.com> | 2018-01-29 15:54:46 +0100 |
|---|---|---|
| committer | Juergen Gross <jgross@suse.com> | 2018-01-29 15:54:46 +0100 |
| commit | fe8cbbbc0e68dad845f72ad75c8099b88f7ff049 (patch) | |
| tree | 2bf17da93b86508fe2f66e87f39897a1d4b403dc /crypto/asymmetric_keys/pkcs7_parser.c | |
| parent | 40248a5f572a9ee5602fb61b33ddcc7de3b4cf5b (diff) | |
| parent | 21864b027d847a6d91903a5ba219770403ba8aad (diff) | |
| download | linux-crypto-fe8cbbbc0e68dad845f72ad75c8099b88f7ff049.tar.gz linux-crypto-fe8cbbbc0e68dad845f72ad75c8099b88f7ff049.zip | |
Merge branch 'master' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Diffstat (limited to 'crypto/asymmetric_keys/pkcs7_parser.c')
| -rw-r--r-- | crypto/asymmetric_keys/pkcs7_parser.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/crypto/asymmetric_keys/pkcs7_parser.c b/crypto/asymmetric_keys/pkcs7_parser.c index d140d8bb..a6dcaa65 100644 --- a/crypto/asymmetric_keys/pkcs7_parser.c +++ b/crypto/asymmetric_keys/pkcs7_parser.c @@ -11,6 +11,7 @@ #define pr_fmt(fmt) "PKCS7: "fmt #include <linux/kernel.h> +#include <linux/module.h> #include <linux/export.h> #include <linux/slab.h> #include <linux/err.h> @@ -19,6 +20,10 @@ #include "pkcs7_parser.h" #include "pkcs7-asn1.h" +MODULE_DESCRIPTION("PKCS#7 parser"); +MODULE_AUTHOR("Red Hat, Inc."); +MODULE_LICENSE("GPL"); + struct pkcs7_parse_context { struct pkcs7_message *msg; /* Message being constructed */ struct pkcs7_signed_info *sinfo; /* SignedInfo being constructed */ @@ -143,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; |