| From a7e65d273de741c48f14f05ed9648233bda1495b Mon Sep 17 00:00:00 2001 |
| From: Wei Yongjun <weiyongjun1@huawei.com> |
| Date: Wed, 15 Jul 2020 23:28:38 +0100 |
| Subject: [PATCH] keys: asymmetric: fix error return code in |
| software_key_query() |
| |
| commit 6cbba1f9114a8134cff9138c79add15012fd52b9 upstream. |
| |
| Fix to return negative error code -ENOMEM from kmalloc() error handling |
| case instead of 0, as done elsewhere in this function. |
| |
| Fixes: f1774cb8956a ("X.509: parse public key parameters from x509 for akcipher") |
| Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> |
| Signed-off-by: David Howells <dhowells@redhat.com> |
| Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/crypto/asymmetric_keys/public_key.c b/crypto/asymmetric_keys/public_key.c |
| index d7f43d4ea925..e5fae4e838c0 100644 |
| --- a/crypto/asymmetric_keys/public_key.c |
| +++ b/crypto/asymmetric_keys/public_key.c |
| @@ -119,6 +119,7 @@ static int software_key_query(const struct kernel_pkey_params *params, |
| if (IS_ERR(tfm)) |
| return PTR_ERR(tfm); |
| |
| + ret = -ENOMEM; |
| key = kmalloc(pkey->keylen + sizeof(u32) * 2 + pkey->paramlen, |
| GFP_KERNEL); |
| if (!key) |
| -- |
| 2.27.0 |
| |
