Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755019AbYCJU5R (ORCPT ); Mon, 10 Mar 2008 16:57:17 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752346AbYCJU5F (ORCPT ); Mon, 10 Mar 2008 16:57:05 -0400 Received: from cdptpa-omtalb.mail.rr.com ([75.180.132.121]:48391 "EHLO cdptpa-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751382AbYCJU5E (ORCPT ); Mon, 10 Mar 2008 16:57:04 -0400 Date: Mon, 10 Mar 2008 16:57:14 -0400 Message-ID: <87fxuyz49h.wl%ysato@users.sourceforge.jp> From: Yoshinori Sato To: Al Viro Cc: lkml , Linus Torvalds , Andrew Morton Subject: Re: [RFC] breakage in 4223cc34365e4 (h8300: uaccess.h update) In-Reply-To: <20080302232314.GW27894@ZenIV.linux.org.uk> References: <20080302232314.GW27894@ZenIV.linux.org.uk> User-Agent: Wanderlust/2.15.5 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?ISO-8859-4?Q?Goj=F2?=) APEL/10.7 Emacs/22.1 (x86_64-pc-linux-gnu) MULE/5.0 (SAKAKI) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3739 Lines: 97 At Sun, 2 Mar 2008 23:23:14 +0000, Al Viro wrote: > > After that commit in asm-h8300/uaccess.h we have > > #define get_user(x, ptr) \ > ({ \ > int __gu_err = 0; \ > uint32_t __gu_val = 0; \ > ^^^^^^^^^^^^^^^^^ > switch (sizeof(*(ptr))) { \ > case 1: \ > case 2: \ > case 4: \ > __gu_val = *(ptr); \ > break; \ > case 8: \ > memcpy(&__gu_val, ptr, sizeof (*(ptr))); \ > ^^^^^^^^^^^^^^^^ > > which, of course, is FUBAR whenever we actually hit that case - memcpy of > 8 bytes into uint32_t is obviously wrong. Why don't we simply do Oops. > > #define get_user(x, ptr) \ > ({ \ > int __gu_err = 0; \ > typeof(*(ptr)) __gu_val = *ptr; \ > switch (sizeof(*(ptr))) { \ > case 1: \ > case 2: \ > case 4: \ > case 8: \ > break; \ > default: \ > __gu_err = __get_user_bad(); \ > break; \ > } \ > (x) = __gu_val; \ > __gu_err; \ > }) > > and be done with that, anyway? Good! no problem. Thank you. Signed-off-by: Al Viro Signed-off-by: Yoshinori Sato include/asm-h8300/uaccess.h | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/include/asm-h8300/uaccess.h b/include/asm-h8300/uaccess.h index a22350e..356068c 100644 --- a/include/asm-h8300/uaccess.h +++ b/include/asm-h8300/uaccess.h @@ -91,22 +91,19 @@ extern int __put_user_bad(void); #define get_user(x, ptr) \ ({ \ int __gu_err = 0; \ - uint32_t __gu_val = 0; \ + typeof(*(ptr)) __gu_val = *ptr; \ switch (sizeof(*(ptr))) { \ case 1: \ case 2: \ case 4: \ - __gu_val = *(ptr); \ - break; \ - case 8: \ - memcpy(&__gu_val, ptr, sizeof (*(ptr))); \ + case 8: \ break; \ default: \ - __gu_val = 0; \ __gu_err = __get_user_bad(); \ + __gu_val = 0; \ break; \ } \ - (x) = (typeof(*(ptr)))__gu_val; \ + (x) = __gu_val; \ __gu_err; \ }) #define __get_user(x, ptr) get_user(x, ptr) -- 1.5.4.3 -- Yoshinori Sato -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/