diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-10-07 11:24:24 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-10-07 11:24:24 +0200 |
| commit | 25a9a924c0c8723ced99179eb639e8c5372a2557 (patch) | |
| tree | 83170168d50b9703486327b5b3a0bfb1d8da9b2b /crypto/asymmetric_keys/x509_public_key.c | |
| parent | 0b101e62afe626ecae60173f92f1e0ec72151653 (diff) | |
| parent | a0eeb8dd34f21fddfe85b37832b5f3d02ee6e34b (diff) | |
| download | blackbird-op-linux-25a9a924c0c8723ced99179eb639e8c5372a2557.tar.gz blackbird-op-linux-25a9a924c0c8723ced99179eb639e8c5372a2557.zip | |
Merge branch 'linus' into x86/asm, to pick up fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'crypto/asymmetric_keys/x509_public_key.c')
| -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 6d88dd15c98d..197096632412 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); |
