From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756800AbdEUTfc (ORCPT ); Sun, 21 May 2017 15:35:32 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:36190 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751315AbdEUTfb (ORCPT ); Sun, 21 May 2017 15:35:31 -0400 Date: Sun, 21 May 2017 12:35:28 -0700 (PDT) From: Linus Torvalds X-X-Sender: torvalds@i7.lan To: Al Viro cc: kernel test robot , linux-kernel@vger.kernel.org, Ingo Molnar , Oleg Nesterov , Peter Zijlstra , Christoph Hellwig , lkp@01.org Subject: Re: [lkp-robot] [waitid()] 75f64d68f9: Kernel_panic-not_syncing:Attempted_to_kill_init!exitcode= In-Reply-To: <20170521073405.GX390@ZenIV.linux.org.uk> Message-ID: References: <20170515223716.2085-8-viro@ZenIV.linux.org.uk> <20170519060820.GW568@yexl-desktop> <20170521073405.GX390@ZenIV.linux.org.uk> User-Agent: Alpine 2.20 (LFD 67 2015-01-07) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, 21 May 2017, Al Viro wrote: > > fix unsafe_put_user() So here's my proposed patch on top of yours to fix unsafe_get_user() with "long long" arguments, and to clean up the extra-long line you did. Comments? Linus --- arch/x86/include/asm/uaccess.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h index d9668c3beb5b..661c497465ce 100644 --- a/arch/x86/include/asm/uaccess.h +++ b/arch/x86/include/asm/uaccess.h @@ -703,14 +703,15 @@ extern struct movsl_mask { #define unsafe_put_user(x, ptr, err_label) \ do { \ int __pu_err; \ - __put_user_size((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)), __pu_err, -EFAULT); \ + __typeof__(*(ptr)) __pu_val = (__typeof__(*(ptr)))(x); \ + __put_user_size(__pu_val, (ptr), sizeof(*(ptr)), __pu_err, -EFAULT); \ if (unlikely(__pu_err)) goto err_label; \ } while (0) #define unsafe_get_user(x, ptr, err_label) \ do { \ int __gu_err; \ - unsigned long __gu_val; \ + __inttype(*(ptr)) __gu_val; \ __get_user_size(__gu_val, (ptr), sizeof(*(ptr)), __gu_err, -EFAULT); \ (x) = (__force __typeof__(*(ptr)))__gu_val; \ if (unlikely(__gu_err)) goto err_label; \