2021-03-03 02:43:33

by 王擎

Subject: [PATCH] arc: kernel: Return -EFAULT if copy_to_user() fails

The copy_to_user() function returns the number of bytes remaining to be
copied, but we want to return -EFAULT if the copy doesn't complete.

Signed-off-by: Wang Qing <[email protected]>
---
arch/arc/kernel/signal.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arc/kernel/signal.c b/arch/arc/kernel/signal.c
index a78d8f7..fdbe06c
--- a/arch/arc/kernel/signal.c
+++ b/arch/arc/kernel/signal.c
@@ -96,7 +96,7 @@ stash_usr_regs(struct rt_sigframe __user *sf, struct pt_regs *regs,
sizeof(sf->uc.uc_mcontext.regs.scratch));
err |= __copy_to_user(&sf->uc.uc_sigmask, set, sizeof(sigset_t));

- return err;
+ return err ? -EFAULT : 0;
}

static int restore_usr_regs(struct pt_regs *regs, struct rt_sigframe __user *sf)
@@ -110,7 +110,7 @@ static int restore_usr_regs(struct pt_regs *regs, struct rt_sigframe __user *sf)
&(sf->uc.uc_mcontext.regs.scratch),
sizeof(sf->uc.uc_mcontext.regs.scratch));
if (err)
- return err;
+ return -EFAULT;

set_current_blocked(&set);
regs->bta = uregs.scratch.bta;
--
2.7.4

2021-03-04 07:02:41

by Vineet Gupta

Subject: Re: [PATCH] arc: kernel: Return -EFAULT if copy_to_user() fails

On 3/1/21 4:05 AM, Wang Qing wrote:
> The copy_to_user() function returns the number of bytes remaining to be
> copied, but we want to return -EFAULT if the copy doesn't complete.
>
> Signed-off-by: Wang Qing <[email protected]>

Acked-by: Vineet Gupta <[email protected]>

Do you want me to pick this up via ARC tree ?

Thx,
-Vineet

> ---
> arch/arc/kernel/signal.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arc/kernel/signal.c b/arch/arc/kernel/signal.c
> index a78d8f7..fdbe06c
> --- a/arch/arc/kernel/signal.c
> +++ b/arch/arc/kernel/signal.c
> @@ -96,7 +96,7 @@ stash_usr_regs(struct rt_sigframe __user *sf, struct pt_regs *regs,
> sizeof(sf->uc.uc_mcontext.regs.scratch));
> err |= __copy_to_user(&sf->uc.uc_sigmask, set, sizeof(sigset_t));
>
> - return err;
> + return err ? -EFAULT : 0;
> }
>
> static int restore_usr_regs(struct pt_regs *regs, struct rt_sigframe __user *sf)
> @@ -110,7 +110,7 @@ static int restore_usr_regs(struct pt_regs *regs, struct rt_sigframe __user *sf)
> &(sf->uc.uc_mcontext.regs.scratch),
> sizeof(sf->uc.uc_mcontext.regs.scratch));
> if (err)
> - return err;
> + return -EFAULT;
>
> set_current_blocked(&set);
> regs->bta = uregs.scratch.bta;
>

2021-03-10 02:52:52

by 王擎

Subject: Re:Re: [PATCH] arc: kernel: Return -EFAULT if copy_to_user() fails

Subject: Re: [PATCH] arc: kernel: Return -EFAULT if copy_to_user() fails>On 3/1/21 4:05 AM, Wang Qing wrote:

>> The copy_to_user() function returns the number of bytes remaining to be
>> copied, but we want to return -EFAULT if the copy doesn't complete.
>>
>> Signed-off-by: Wang Qing <[email protected]>
>
>Acked-by: Vineet Gupta <[email protected]>
>
>Do you want me to pick this up via ARC tree ?

Yes, thank you for picking this up.

Wangqing

>
>Thx,
>-Vineet