diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-12-11 13:07:13 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-12-11 13:07:13 +0100 |
| commit | 6f38751510073cc054c5dffc3339b22f9385ceed (patch) | |
| tree | b7704b2d3388293118a6794f7a858e8891bcec60 /crypto/asymmetric_keys/x509_cert_parser.c | |
| parent | f4ec57b632fe15ed7a355099cb96ed4b647416de (diff) | |
| parent | 045169816b31b10faed984b01c390db1b32ee4c1 (diff) | |
Merge branch 'linus' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'crypto/asymmetric_keys/x509_cert_parser.c')
| -rw-r--r-- | crypto/asymmetric_keys/x509_cert_parser.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/crypto/asymmetric_keys/x509_cert_parser.c b/crypto/asymmetric_keys/x509_cert_parser.c index 865f46ea724f..c80765b211cf 100644 --- a/crypto/asymmetric_keys/x509_cert_parser.c +++ b/crypto/asymmetric_keys/x509_cert_parser.c @@ -133,7 +133,6 @@ struct x509_certificate *x509_cert_parse(const void *data, size_t datalen) return cert; error_decode: - kfree(cert->pub->key); kfree(ctx); error_no_ctx: x509_free_certificate(cert); |