From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B30ADC2D0E8 for ; Fri, 27 Mar 2020 10:41:11 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8C11620578 for ; Fri, 27 Mar 2020 10:41:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8C11620578 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:39976 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHmQI-0000gX-LB for qemu-devel@archiver.kernel.org; Fri, 27 Mar 2020 06:41:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33811) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHmPl-0000GE-3i for qemu-devel@nongnu.org; Fri, 27 Mar 2020 06:40:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHmPj-0007pk-Uv for qemu-devel@nongnu.org; Fri, 27 Mar 2020 06:40:37 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:34803) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jHmPj-0007n7-Ke for qemu-devel@nongnu.org; Fri, 27 Mar 2020 06:40:35 -0400 Received: from [192.168.100.1] ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue106 [213.165.67.119]) with ESMTPSA (Nemesis) id 1MRBWU-1iubFi47xE-00N8sW; Fri, 27 Mar 2020 11:40:23 +0100 Subject: Re: [PATCH v1 2/7] linux-user: protect fcntl64 with an #ifdef To: =?UTF-8?Q?Alex_Benn=c3=a9e?= , qemu-devel@nongnu.org References: <20200327094945.23768-1-alex.bennee@linaro.org> <20200327094945.23768-3-alex.bennee@linaro.org> From: Laurent Vivier Autocrypt: addr=laurent@vivier.eu; prefer-encrypt=mutual; keydata= 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 Message-ID: <8c4087ce-3c09-07c5-858b-6c972b85b352@vivier.eu> Date: Fri, 27 Mar 2020 11:40:21 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.6.0 MIME-Version: 1.0 In-Reply-To: <20200327094945.23768-3-alex.bennee@linaro.org> Content-Type: text/plain; charset=utf-8 Content-Language: fr Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K1:tHlwsZIM/UUu/KaP2doc7wlMiSk58ADg3XhxYoa0s4QAkUM3LUt AlzyKETEvTjBqriqiPJPMDIZXajwKNkwxgEQsjjleio8C3xcNw7x8C2+DqmHyuvkDQSYDGD 7P0UO8jr25IuU9WOU34uWDTHgLGUIRKWgUMsu1FDT89lUE4mqpqDrw0RBYPdD2WfZh9x7dI iNWYRSuFCqr7wQY0oyztg== X-UI-Out-Filterresults: notjunk:1;V03:K0:yFkOhwvsV94=:rc1nFtThqsmO30sdQxZIxN qP5lJy3tKvBYI/jwgoRQVIybflfwlThr37I5/yEv+uKE+3zO8j9LE7e0symiQ+g3HS2yOCffW lz89DEhHMM8zhdxR8SE34t08iC8T4xHhbkTCL3fB/FhQ/6Dpu4UGzJAD/GqG7G6+NgztyWI4l /N/0KrT7BLQFRDKUT9qrgffa/E216qLIHlh6x0slJULtjoKDCicF28TqXUh8y5zy+WJ9RS+QZ u8qUHRXBABurFZ8Aw9AtkNR3f8OnrjYyqe/sNkQsAX5IF8LsnUCZVxuK7FmoK8goUMouroW3h +hCAnGtJvKGC/PgZxjmKaa4CPzEl+sDcE5bwmyqv90UHdEsFUHK44OBHjAsRma50WKDCH0MMn cjUJJsnVVM7tTW0xa0BXw7N4bJlXEjCCnkutJPLU5NOdRxCQ5giWXFREZELgNgkXioxu3LSGv batb5j4oV+VVNkplJbaM+sMeLMIk2WQwLCkcLwigl9OeeC3JRIBnO0FYAkYdtw4f7muBoj78M c/cyXBmDC+aFZ8GCFtZ1GQ/+5Gv7ky3Uo4OolMpDfrzZb9tYyFye4onped+CRhVe+VFa0vmOR 1TrLI638d6uNKVBn36Cr5xc4TNbOCIv/AkHP0XxRSUZueTY4y+B7KDYLxpeNAKy5dELvjePtr AwaZFjRUW+WOjg3Zo9Zb2TBNhMICn4A353LHAJIBNVDWs8YHlZOmuwxZ3PXPmCfDK6hdJ78LC yCKutl44VCq2XZpZz2yc77MSilMD7gNCv+M28ZyEdmVgV65reW5BWt3ZakHuxGmoM1L5SWNmA PPHYNKYvHW9H1J5OJHk6Ah/JDoK08KhXi4aPIv+B9tDZwsk6MvFqg4mgN7lok4bT23+9Lhc X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.17.13 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Riku Voipio Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Le 27/03/2020 à 10:49, Alex Bennée a écrit : > Checking TARGET_ABI_BITS is sketchy - we should check for the presence > of the define to be sure. Also clean up the white space while we are > there. > > Signed-off-by: Alex Bennée > --- > linux-user/syscall.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/linux-user/syscall.c b/linux-user/syscall.c > index 49395dcea97..a3da46d69f9 100644 > --- a/linux-user/syscall.c > +++ b/linux-user/syscall.c > @@ -11223,11 +11223,11 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, > This is a hint, so ignoring and returning success is ok. */ > return 0; > #endif > -#if TARGET_ABI_BITS == 32 > +#ifdef TARGET_NR_fcntl64 > case TARGET_NR_fcntl64: > { > - int cmd; > - struct flock64 fl; > + int cmd; > + struct flock64 fl; > from_flock64_fn *copyfrom = copy_from_user_flock64; > to_flock64_fn *copyto = copy_to_user_flock64; > > @@ -11238,7 +11238,7 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, > } > #endif > > - cmd = target_to_host_fcntl_cmd(arg2); > + cmd = target_to_host_fcntl_cmd(arg2); > if (cmd == -TARGET_EINVAL) { > return cmd; > } > Reviewed-by: Laurent Vivier