diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2015-10-25 12:38:20 +0200 |
|---|---|---|
| committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2015-10-25 12:38:20 +0200 |
| commit | 09d8cc538d728e87286477f6b4266935d3ac9554 (patch) | |
| tree | 2e06766c6de24be508328fd0c2f8d3e821f2ad3b /crypto/asymmetric_keys | |
| parent | fc4d0d2a1b069a231939ca4b01a3d003e77c723a (diff) | |
| parent | 82d748eb43a673a56b639efd4d698e1e95715d82 (diff) | |
| download | linux-crypto-09d8cc538d728e87286477f6b4266935d3ac9554.tar.gz linux-crypto-09d8cc538d728e87286477f6b4266935d3ac9554.zip | |
Merge remote-tracking branch 'mac80211-next/master' into next
Diffstat (limited to 'crypto/asymmetric_keys')
| -rw-r--r-- | crypto/asymmetric_keys/x509_public_key.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/crypto/asymmetric_keys/x509_public_key.c b/crypto/asymmetric_keys/x509_public_key.c index 6d88dd15..19709663 100644 --- a/crypto/asymmetric_keys/x509_public_key.c +++ b/crypto/asymmetric_keys/x509_public_key.c @@ -332,10 +332,6 @@ static int x509_key_preparse(struct key_preparsed_payload *prep) srlen = cert->raw_serial_size; q = cert->raw_serial; } - if (srlen > 1 && *q == 0) { - srlen--; - q++; - } ret = -ENOMEM; desc = kmalloc(sulen + 2 + srlen * 2 + 1, GFP_KERNEL); |