* [PATCH] crypto: ccp: Use memdup_user() rather than duplicating its implementation
@ 2018-03-05 13:10 SF Markus Elfring
2018-03-05 18:52 ` Brijesh Singh
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: SF Markus Elfring @ 2018-03-05 13:10 UTC (permalink / raw)
To: linux-crypto, Brijesh Singh, David S. Miller, Gary Hook,
Herbert Xu, Tom Lendacky
Cc: LKML, kernel-janitors, kvm, Borislav Petkov, Paolo Bonzini,
Radim Krčmář
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Mon, 5 Mar 2018 13:50:13 +0100
Reuse existing functionality from memdup_user() instead of keeping
duplicate source code.
This issue was detected by using the Coccinelle software.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/crypto/ccp/psp-dev.c | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
diff --git a/drivers/crypto/ccp/psp-dev.c b/drivers/crypto/ccp/psp-dev.c
index fcfa5b1eae61..8255258cd040 100644
--- a/drivers/crypto/ccp/psp-dev.c
+++ b/drivers/crypto/ccp/psp-dev.c
@@ -367,8 +367,6 @@ static int sev_ioctl_do_pek_csr(struct sev_issue_cmd *argp)
void *psp_copy_user_blob(u64 __user uaddr, u32 len)
{
- void *data;
-
if (!uaddr || !len)
return ERR_PTR(-EINVAL);
@@ -376,18 +374,7 @@ void *psp_copy_user_blob(u64 __user uaddr, u32 len)
if (len > SEV_FW_BLOB_MAX_SIZE)
return ERR_PTR(-EINVAL);
- data = kmalloc(len, GFP_KERNEL);
- if (!data)
- return ERR_PTR(-ENOMEM);
-
- if (copy_from_user(data, (void __user *)(uintptr_t)uaddr, len))
- goto e_free;
-
- return data;
-
-e_free:
- kfree(data);
- return ERR_PTR(-EFAULT);
+ return memdup_user((void __user *)(uintptr_t)uaddr, len);
}
EXPORT_SYMBOL_GPL(psp_copy_user_blob);
--
2.16.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] crypto: ccp: Use memdup_user() rather than duplicating its implementation
2018-03-05 13:10 [PATCH] crypto: ccp: Use memdup_user() rather than duplicating its implementation SF Markus Elfring
@ 2018-03-05 18:52 ` Brijesh Singh
2018-03-05 19:41 ` Gary R Hook
2018-03-16 15:53 ` Herbert Xu
2 siblings, 0 replies; 4+ messages in thread
From: Brijesh Singh @ 2018-03-05 18:52 UTC (permalink / raw)
To: SF Markus Elfring, linux-crypto, David S. Miller, Gary Hook,
Herbert Xu, Tom Lendacky
Cc: brijesh.singh, LKML, kernel-janitors, kvm, Borislav Petkov,
Paolo Bonzini, Radim Krčmář
On 3/5/18 7:10 AM, SF Markus Elfring wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Mon, 5 Mar 2018 13:50:13 +0100
>
> Reuse existing functionality from memdup_user() instead of keeping
> duplicate source code.
>
> This issue was detected by using the Coccinelle software.
>
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
> ---
> drivers/crypto/ccp/psp-dev.c | 15 +--------------
> 1 file changed, 1 insertion(+), 14 deletions(-)
Reviewed-by: Brijesh Singh <brijesh.singh@amd.com>
thanks
> diff --git a/drivers/crypto/ccp/psp-dev.c b/drivers/crypto/ccp/psp-dev.c
> index fcfa5b1eae61..8255258cd040 100644
> --- a/drivers/crypto/ccp/psp-dev.c
> +++ b/drivers/crypto/ccp/psp-dev.c
> @@ -367,8 +367,6 @@ static int sev_ioctl_do_pek_csr(struct sev_issue_cmd *argp)
>
> void *psp_copy_user_blob(u64 __user uaddr, u32 len)
> {
> - void *data;
> -
> if (!uaddr || !len)
> return ERR_PTR(-EINVAL);
>
> @@ -376,18 +374,7 @@ void *psp_copy_user_blob(u64 __user uaddr, u32 len)
> if (len > SEV_FW_BLOB_MAX_SIZE)
> return ERR_PTR(-EINVAL);
>
> - data = kmalloc(len, GFP_KERNEL);
> - if (!data)
> - return ERR_PTR(-ENOMEM);
> -
> - if (copy_from_user(data, (void __user *)(uintptr_t)uaddr, len))
> - goto e_free;
> -
> - return data;
> -
> -e_free:
> - kfree(data);
> - return ERR_PTR(-EFAULT);
> + return memdup_user((void __user *)(uintptr_t)uaddr, len);
> }
> EXPORT_SYMBOL_GPL(psp_copy_user_blob);
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] crypto: ccp: Use memdup_user() rather than duplicating its implementation
2018-03-05 13:10 [PATCH] crypto: ccp: Use memdup_user() rather than duplicating its implementation SF Markus Elfring
2018-03-05 18:52 ` Brijesh Singh
@ 2018-03-05 19:41 ` Gary R Hook
2018-03-16 15:53 ` Herbert Xu
2 siblings, 0 replies; 4+ messages in thread
From: Gary R Hook @ 2018-03-05 19:41 UTC (permalink / raw)
To: SF Markus Elfring, linux-crypto, Brijesh Singh, David S. Miller,
Herbert Xu, Tom Lendacky
Cc: LKML, kernel-janitors, kvm, Borislav Petkov, Paolo Bonzini,
Radim Krčmář
On 03/05/2018 07:10 AM, SF Markus Elfring wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Mon, 5 Mar 2018 13:50:13 +0100
>
> Reuse existing functionality from memdup_user() instead of keeping
> duplicate source code.
>
> This issue was detected by using the Coccinelle software.
>
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Acked-by: Gary R Hook <gary.hook@amd.com>
> ---
> drivers/crypto/ccp/psp-dev.c | 15 +--------------
> 1 file changed, 1 insertion(+), 14 deletions(-)
>
> diff --git a/drivers/crypto/ccp/psp-dev.c b/drivers/crypto/ccp/psp-dev.c
> index fcfa5b1eae61..8255258cd040 100644
> --- a/drivers/crypto/ccp/psp-dev.c
> +++ b/drivers/crypto/ccp/psp-dev.c
> @@ -367,8 +367,6 @@ static int sev_ioctl_do_pek_csr(struct sev_issue_cmd *argp)
>
> void *psp_copy_user_blob(u64 __user uaddr, u32 len)
> {
> - void *data;
> -
> if (!uaddr || !len)
> return ERR_PTR(-EINVAL);
>
> @@ -376,18 +374,7 @@ void *psp_copy_user_blob(u64 __user uaddr, u32 len)
> if (len > SEV_FW_BLOB_MAX_SIZE)
> return ERR_PTR(-EINVAL);
>
> - data = kmalloc(len, GFP_KERNEL);
> - if (!data)
> - return ERR_PTR(-ENOMEM);
> -
> - if (copy_from_user(data, (void __user *)(uintptr_t)uaddr, len))
> - goto e_free;
> -
> - return data;
> -
> -e_free:
> - kfree(data);
> - return ERR_PTR(-EFAULT);
> + return memdup_user((void __user *)(uintptr_t)uaddr, len);
> }
> EXPORT_SYMBOL_GPL(psp_copy_user_blob);
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] crypto: ccp: Use memdup_user() rather than duplicating its implementation
2018-03-05 13:10 [PATCH] crypto: ccp: Use memdup_user() rather than duplicating its implementation SF Markus Elfring
2018-03-05 18:52 ` Brijesh Singh
2018-03-05 19:41 ` Gary R Hook
@ 2018-03-16 15:53 ` Herbert Xu
2 siblings, 0 replies; 4+ messages in thread
From: Herbert Xu @ 2018-03-16 15:53 UTC (permalink / raw)
To: SF Markus Elfring
Cc: linux-crypto, Brijesh Singh, David S. Miller, Gary Hook,
Tom Lendacky, LKML, kernel-janitors, kvm, Borislav Petkov,
Paolo Bonzini, Radim Krčmář
On Mon, Mar 05, 2018 at 02:10:20PM +0100, SF Markus Elfring wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Mon, 5 Mar 2018 13:50:13 +0100
>
> Reuse existing functionality from memdup_user() instead of keeping
> duplicate source code.
>
> This issue was detected by using the Coccinelle software.
>
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Patch applied. Thanks.
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-03-16 15:53 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-05 13:10 [PATCH] crypto: ccp: Use memdup_user() rather than duplicating its implementation SF Markus Elfring
2018-03-05 18:52 ` Brijesh Singh
2018-03-05 19:41 ` Gary R Hook
2018-03-16 15:53 ` Herbert Xu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox