From nobody Sat May 4 16:31:28 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1604591659; cv=none; d=zohomail.com; s=zohoarc; b=H93P79jsUBVFibFMlQuEKZzoed9j1RTIL6yWmMTuXTV/Hb7lvRvlU6Ya7ZlfrdsiEbxwNHGluvdQ2aNDE3ZIkw1eNV4w77mjMI+THKmlYSbKB4LkKpUgMBQjmQPFwGyYPMPu6eYlZKzqsK5SXoKEdmJR3HV+Jffp5i/qulJrOuI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604591659; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=s8wazc77+ZcgHKV3m1P3LAIQ93INB85KM7Ik6EYQku8=; b=J+V5ONqgoNpyVV3l4xQ8Z6XWO2Bcc5ReOok1c4QhPa1IGlwH3g7nRdJ1VRW4i5loKIGr4oG6yKi/X+QvmYUoLDUUiGpT1/h0gHBQFPzA565jlWY6O0wTNXdR/dAFPnwR8hxIFIl6fe9/BLzVkwTKKfzBNdNTB+zNMdSc2GZJu9o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16045916595771010.5653310511938; Thu, 5 Nov 2020 07:54:19 -0800 (PST) Received: from localhost ([::1]:52704 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kahac-0002YB-GR for importer@patchew.org; Thu, 05 Nov 2020 10:54:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35322) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kahZJ-0001Lk-33 for qemu-devel@nongnu.org; Thu, 05 Nov 2020 10:52:57 -0500 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:34795) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kahZG-0000Jv-Tm for qemu-devel@nongnu.org; Thu, 05 Nov 2020 10:52:56 -0500 Received: by mail-wr1-x442.google.com with SMTP id e6so2349388wro.1 for ; Thu, 05 Nov 2020 07:52:54 -0800 (PST) Received: from [192.168.1.103] ([151.33.227.77]) by smtp.gmail.com with ESMTPSA id t13sm3309178wru.67.2020.11.05.07.52.52 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 05 Nov 2020 07:52:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:cc:from:subject:message-id:date:user-agent:mime-version :content-language:content-transfer-encoding; bh=s8wazc77+ZcgHKV3m1P3LAIQ93INB85KM7Ik6EYQku8=; b=Mnbip4gbKV3JV9xSiUE5LVQyYAnrBMymrIRB74s8Lkj1SwZSZjapO8rkZN9IoThWIL aAe/CNuJ7jBYg+pfMEkr8kVTsxXRONojGGdBufanvomLWAh+RvaKM8H9JpCHakXyr3a7 XrXfnveTUu3+m0KnvIRDYUQSTsr1aryPTEfCK5nq2c+TPucjAHjisvFO/YNmIO5UvOeQ NMDdIdzMFbH9l8u1YzT+ms/t5DBgje8m5j70mMNa7hfiwvi0FEPv77uDXFq7J+CDxbtX oiBOQDTzOF7zwyDCMKndvICym2zbfW/1IZhC2FYEYs0+ujkBle6/iyWZp1ZY+pwcpPDS YO+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:cc:from:subject:message-id:date:user-agent :mime-version:content-language:content-transfer-encoding; bh=s8wazc77+ZcgHKV3m1P3LAIQ93INB85KM7Ik6EYQku8=; b=HqPzUIxD6l7lVKe91qSpa0M6ZPYO0RrHb7ZQctzalVXjIj69ObYHJF2BOfx7LGMh5n 72Ze6Nbs09RwtHxn7IDXh7rZpPPtIjvtCifr1z2aC6xLMUjTMXxe9nQi1fnD18kNWhAj nPy41k96y15c2lMtDrABCH2nkRX9Af9QlZcUrslN7xiS0+reanbzg4/g0p8vEGHIdYxw ch+z9vcYysxdfoJJ6zgYCGkO6sTTMJey1w43hLKdwJJnK46fqgaBJbV9GR6BKIHZf3cO JpghDO+Gj8s/LrCt8sNbaOZ2tZvxLLGnf88+C9rNixjz52BMvLMaZJnJTmaK1NtzU1+J 1x+Q== X-Gm-Message-State: AOAM530HkcugwNHwQ0DNDp7YJmCwSsHwSez+fH9Hs6dPNUy9pg8z1Kdk qudAbY+lBgTPe6ZnVHC9uro= X-Google-Smtp-Source: ABdhPJx0KYkys6b+NXequ2WpFP+qX/LddhI/6VcslS/7o91Dpx2y2+VdWhfrWf//672vXg93hhPMhA== X-Received: by 2002:adf:cd81:: with SMTP id q1mr3978796wrj.410.1604591573135; Thu, 05 Nov 2020 07:52:53 -0800 (PST) To: QEMU Developers From: LemonBoy Subject: [PATCH v2] linux-user: Correct definition of stack_t Message-ID: Date: Thu, 5 Nov 2020 16:52:51 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.4.0 MIME-Version: 1.0 Content-Language: en-US Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::442; envelope-from=thatlemon@gmail.com; helo=mail-wr1-x442.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Peter Maydell , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Some platforms used the wrong definition of stack_t where the flags and size fields were swapped or where the flags field had type ulong instead of int. Due to the presence of padding space in the structure and the prevalence of little-endian machines this problem went unnoticed for a long time. The type definitions have been cross-checked with the ones defined in the Linux kernel v5.9, plus some older versions for a few architecture that have been removed and Xilinx's kernel fork for NiosII [1]. The bsd-user headers remain unchanged as I don't know if they are wrong or not. [1] https://github.com/Xilinx/linux-xlnx/blob/master/arch/nios2/include/uap= i/asm/signal.h Signed-off-by: Giuseppe Musacchio Reviewed-by: Peter Maydell --- linux-user/alpha/target_signal.h | 3 +-- linux-user/arm/target_signal.h | 6 +++--- linux-user/cris/target_signal.h | 6 +++--- linux-user/hppa/target_signal.h | 2 +- linux-user/i386/target_signal.h | 6 +++--- linux-user/m68k/target_signal.h | 6 +++--- linux-user/microblaze/target_signal.h | 6 +++--- linux-user/mips/target_signal.h | 6 +++--- linux-user/mips64/target_signal.h | 7 +++---- linux-user/nios2/target_signal.h | 5 +++-- linux-user/ppc/target_signal.h | 6 +++--- linux-user/s390x/target_signal.h | 2 +- linux-user/sh4/target_signal.h | 6 +++--- linux-user/sparc/target_signal.h | 6 +++--- linux-user/x86_64/target_signal.h | 6 +++--- 15 files changed, 39 insertions(+), 40 deletions(-) diff --git a/linux-user/alpha/target_signal.h b/linux-user/alpha/target_sig= nal.h index cd63d59fde..b83797281c 100644 --- a/linux-user/alpha/target_signal.h +++ b/linux-user/alpha/target_signal.h @@ -42,8 +42,7 @@ =20 typedef struct target_sigaltstack { abi_ulong ss_sp; - int32_t ss_flags; - int32_t dummy; + abi_int ss_flags; abi_ulong ss_size; } target_stack_t; =20 diff --git a/linux-user/arm/target_signal.h b/linux-user/arm/target_signal.h index ea123c40f3..0998dd6dfa 100644 --- a/linux-user/arm/target_signal.h +++ b/linux-user/arm/target_signal.h @@ -4,9 +4,9 @@ /* this struct defines a stack used during syscall handling */ =20 typedef struct target_sigaltstack { - abi_ulong ss_sp; - abi_long ss_flags; - abi_ulong ss_size; + abi_ulong ss_sp; + abi_int ss_flags; + abi_ulong ss_size; } target_stack_t; =20 =20 diff --git a/linux-user/cris/target_signal.h b/linux-user/cris/target_signa= l.h index 1cb5548f85..495a142896 100644 --- a/linux-user/cris/target_signal.h +++ b/linux-user/cris/target_signal.h @@ -4,9 +4,9 @@ /* this struct defines a stack used during syscall handling */ =20 typedef struct target_sigaltstack { - abi_ulong ss_sp; - abi_ulong ss_size; - abi_long ss_flags; + abi_ulong ss_sp; + abi_int ss_flags; + abi_ulong ss_size; } target_stack_t; =20 =20 diff --git a/linux-user/hppa/target_signal.h b/linux-user/hppa/target_signa= l.h index c2a0102ed7..c52a3ea579 100644 --- a/linux-user/hppa/target_signal.h +++ b/linux-user/hppa/target_signal.h @@ -44,7 +44,7 @@ =20 typedef struct target_sigaltstack { abi_ulong ss_sp; - int32_t ss_flags; + abi_int ss_flags; abi_ulong ss_size; } target_stack_t; =20 diff --git a/linux-user/i386/target_signal.h b/linux-user/i386/target_signa= l.h index f55e78fd33..50361af874 100644 --- a/linux-user/i386/target_signal.h +++ b/linux-user/i386/target_signal.h @@ -4,9 +4,9 @@ /* this struct defines a stack used during syscall handling */ =20 typedef struct target_sigaltstack { - abi_ulong ss_sp; - abi_long ss_flags; - abi_ulong ss_size; + abi_ulong ss_sp; + abi_int ss_flags; + abi_ulong ss_size; } target_stack_t; =20 =20 diff --git a/linux-user/m68k/target_signal.h b/linux-user/m68k/target_signa= l.h index 314e808844..d096544ef8 100644 --- a/linux-user/m68k/target_signal.h +++ b/linux-user/m68k/target_signal.h @@ -4,9 +4,9 @@ /* this struct defines a stack used during syscall handling */ =20 typedef struct target_sigaltstack { - abi_ulong ss_sp; - abi_long ss_flags; - abi_ulong ss_size; + abi_ulong ss_sp; + abi_int ss_flags; + abi_ulong ss_size; } target_stack_t; =20 =20 diff --git a/linux-user/microblaze/target_signal.h b/linux-user/microblaze/= target_signal.h index 08bcf24b9d..1c326296de 100644 --- a/linux-user/microblaze/target_signal.h +++ b/linux-user/microblaze/target_signal.h @@ -4,9 +4,9 @@ /* this struct defines a stack used during syscall handling */ =20 typedef struct target_sigaltstack { - abi_ulong ss_sp; - abi_ulong ss_size; - abi_long ss_flags; + abi_ulong ss_sp; + abi_int ss_flags; + abi_ulong ss_size; } target_stack_t; =20 =20 diff --git a/linux-user/mips/target_signal.h b/linux-user/mips/target_signa= l.h index 66e1ad44a6..fa4084a99d 100644 --- a/linux-user/mips/target_signal.h +++ b/linux-user/mips/target_signal.h @@ -45,9 +45,9 @@ /* this struct defines a stack used during syscall handling */ =20 typedef struct target_sigaltstack { - abi_long ss_sp; - abi_ulong ss_size; - abi_long ss_flags; + abi_ulong ss_sp; + abi_ulong ss_size; + abi_int ss_flags; } target_stack_t; =20 =20 diff --git a/linux-user/mips64/target_signal.h b/linux-user/mips64/target_s= ignal.h index 753e91fbd6..799f7a668c 100644 --- a/linux-user/mips64/target_signal.h +++ b/linux-user/mips64/target_signal.h @@ -45,12 +45,11 @@ /* this struct defines a stack used during syscall handling */ =20 typedef struct target_sigaltstack { - abi_long ss_sp; - abi_ulong ss_size; - abi_int ss_flags; + abi_ulong ss_sp; + abi_ulong ss_size; + abi_int ss_flags; } target_stack_t; =20 - /* * sigaltstack controls */ diff --git a/linux-user/nios2/target_signal.h b/linux-user/nios2/target_sig= nal.h index fe48721b3d..aebf749f12 100644 --- a/linux-user/nios2/target_signal.h +++ b/linux-user/nios2/target_signal.h @@ -4,11 +4,12 @@ /* this struct defines a stack used during syscall handling */ =20 typedef struct target_sigaltstack { - abi_long ss_sp; + abi_ulong ss_sp; + abi_int ss_flags; abi_ulong ss_size; - abi_long ss_flags; } target_stack_t; =20 + /* sigaltstack controls */ #define TARGET_SS_ONSTACK 1 #define TARGET_SS_DISABLE 2 diff --git a/linux-user/ppc/target_signal.h b/linux-user/ppc/target_signal.h index 4453e2e7ef..72fcdd9bfa 100644 --- a/linux-user/ppc/target_signal.h +++ b/linux-user/ppc/target_signal.h @@ -4,9 +4,9 @@ /* this struct defines a stack used during syscall handling */ =20 typedef struct target_sigaltstack { - abi_ulong ss_sp; - int ss_flags; - abi_ulong ss_size; + abi_ulong ss_sp; + abi_int ss_flags; + abi_ulong ss_size; } target_stack_t; =20 =20 diff --git a/linux-user/s390x/target_signal.h b/linux-user/s390x/target_sig= nal.h index b58bc7c20f..bbfc464d44 100644 --- a/linux-user/s390x/target_signal.h +++ b/linux-user/s390x/target_signal.h @@ -3,7 +3,7 @@ =20 typedef struct target_sigaltstack { abi_ulong ss_sp; - int ss_flags; + abi_int ss_flags; abi_ulong ss_size; } target_stack_t; =20 diff --git a/linux-user/sh4/target_signal.h b/linux-user/sh4/target_signal.h index 434970a990..d7309b7136 100644 --- a/linux-user/sh4/target_signal.h +++ b/linux-user/sh4/target_signal.h @@ -4,9 +4,9 @@ /* this struct defines a stack used during syscall handling */ =20 typedef struct target_sigaltstack { - abi_ulong ss_sp; - abi_long ss_flags; - abi_ulong ss_size; + abi_ulong ss_sp; + abi_int ss_flags; + abi_ulong ss_size; } target_stack_t; =20 =20 diff --git a/linux-user/sparc/target_signal.h b/linux-user/sparc/target_sig= nal.h index 5cc40327d2..1b10d1490f 100644 --- a/linux-user/sparc/target_signal.h +++ b/linux-user/sparc/target_signal.h @@ -42,9 +42,9 @@ /* this struct defines a stack used during syscall handling */ =20 typedef struct target_sigaltstack { - abi_ulong ss_sp; - abi_long ss_flags; - abi_ulong ss_size; + abi_ulong ss_sp; + abi_int ss_flags; + abi_ulong ss_size; } target_stack_t; =20 =20 diff --git a/linux-user/x86_64/target_signal.h b/linux-user/x86_64/target_s= ignal.h index 4c4380f7b9..4ea74f20dd 100644 --- a/linux-user/x86_64/target_signal.h +++ b/linux-user/x86_64/target_signal.h @@ -4,9 +4,9 @@ /* this struct defines a stack used during syscall handling */ =20 typedef struct target_sigaltstack { - abi_ulong ss_sp; - abi_long ss_flags; - abi_ulong ss_size; + abi_ulong ss_sp; + abi_int ss_flags; + abi_ulong ss_size; } target_stack_t; =20 =20 --=20 2.27.0