ACK: [SRU][Bionic][PATCH] s390/compat: fix setup_frame32

Colin Ian King colin.king at canonical.com
Wed Apr 18 16:33:52 UTC 2018


On 18/04/18 15:48, Seth Forshee wrote:
> From: Heiko Carstens <heiko.carstens at de.ibm.com>
> 
> http://bugs.launchpad.net/bugs/1765083
> 
> Git commit c60a03fee0e5 ("s390: switch to {get,put}_compat_sigset()")
> contains a typo and now copies the wrong pointer to user space.
> Use the correct pointer instead.
> 
> Reported-and-tested-by: Stefan Liebler <stli at linux.vnet.ibm.com>
> Fixes: c60a03fee0e5 ("s390: switch to {get,put}_compat_sigset()")
> Cc: <stable at vger.kernel.org> # v4.15+
> Cc: Al Viro <viro at zeniv.linux.org.uk>
> Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
> Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
> (cherry picked from commit 8b09ca746a643ca452cd41a522046a96ee5a55fd)
> Signed-off-by: Seth Forshee <seth.forshee at canonical.com>
> ---
>  arch/s390/kernel/compat_signal.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/s390/kernel/compat_signal.c b/arch/s390/kernel/compat_signal.c
> index ef246940b44c..f19e90856e49 100644
> --- a/arch/s390/kernel/compat_signal.c
> +++ b/arch/s390/kernel/compat_signal.c
> @@ -379,7 +379,7 @@ static int setup_frame32(struct ksignal *ksig, sigset_t *set,
>  	if (put_compat_sigset((compat_sigset_t __user *)frame->sc.oldmask,
>  			      set, sizeof(compat_sigset_t)))
>  		return -EFAULT;
> -	if (__put_user(ptr_to_compat(&frame->sc), &frame->sc.sregs))
> +	if (__put_user(ptr_to_compat(&frame->sregs), &frame->sc.sregs))
>  		return -EFAULT;
>  
>  	/* Store registers needed to create the signal frame */
> 
Clean upstream cherry pick, looks good.

Acked-by: Colin Ian King <colin.king at canonical.com>




More information about the kernel-team mailing list