From nobody Fri May 3 18:24:15 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1641360312; cv=none; d=zohomail.com; s=zohoarc; b=JYaLNNlEE2t53ZuJN3DTuZcsok2T/efqceFK27bKbBTZzofQ0msQ355RJCZ6I22ATJsvJT/0b51jG+iu/lxcaYzXDfbI97Du0qHz7sRea1YjfzpjdOjI9he8cNxMx+LSShB7XXw6/ROatALGtnLA/iXpGeI+LOHYJcB+NwlLmzA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641360312; h=Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=s2NU64QEsz6R/k3U+kTGtVUwuUoMUWCNpIvdZLR5x1I=; b=lhQo3OQX9pSwseNzWiKuaFmiTOpcdOHEciGD5zgn7vbX1Mdw7XAK82SsqFUbwowsd8IH1QKrCVfofe+jnRlA6f8wXNiRJW24jqZzV0bOFKF2IjA7BeLdB6knzn0TsvbTDQ7dj8Yt8eBF+7fyJWrEsv0Gw2gsNx1qPc9xdc+VE4E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 164136031211445.39776502953646; Tue, 4 Jan 2022 21:25:12 -0800 (PST) Received: from localhost ([::1]:35600 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n4ynO-0003Hg-B7 for importer@patchew.org; Wed, 05 Jan 2022 00:25:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:53400) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n4ym1-0002Vg-Uk for qemu-devel@nongnu.org; Wed, 05 Jan 2022 00:23:45 -0500 Received: from [2607:f8b0:4864:20::1031] (port=54919 helo=mail-pj1-x1031.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n4yly-0007ui-9S for qemu-devel@nongnu.org; Wed, 05 Jan 2022 00:23:44 -0500 Received: by mail-pj1-x1031.google.com with SMTP id jw3so33035480pjb.4 for ; Tue, 04 Jan 2022 21:23:41 -0800 (PST) Received: from localhost.localdomain (174-21-75-75.tukw.qwest.net. [174.21.75.75]) by smtp.gmail.com with ESMTPSA id s14sm43785342pfk.171.2022.01.04.21.23.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jan 2022 21:23:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=s2NU64QEsz6R/k3U+kTGtVUwuUoMUWCNpIvdZLR5x1I=; b=setHeOfwFYmK4QA9xnwC7adB7UqIDnl5/bIGUl5pVmcZR4QzwWOJDACXBW5BbL4W36 ktNqKfTwQz/O+WZ0GiwQnfTlH4JbAcbJvfSBwRS77XnXsL90trSrau92c9EuRNSRXCX0 cKLD+h7p88oDCoFJo8VAJvomyvsYhlURCxsyF4uPHNk4h23Qjr1saw1NMpTs8Og9kou1 3veWYTi1fyhLQFWDc5BeS+0dhrudwYD2qNuDAFd6AfqtEGZ6m3NI5yJSPmtBiEnQVaMG YxzTlz/jLzDj8NMcVUv7xfOJilWVKz/kf5JqlGBhdCZ27mNANYDn49K//R+ZCY5eP0F2 nUWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=s2NU64QEsz6R/k3U+kTGtVUwuUoMUWCNpIvdZLR5x1I=; b=vx/HQ7ZZnkEwvyIN1gP5xalR2YBU2d0CKMNjNNGrpkgWOz8SDZ1gNlLJOduqiDb+8h g5IuVneY6OJck+BlgVwsCbwNQGXFXJOOacp37w6yS3e5ikn2EEXLyWjj1k6uFkOIBoeD PZR/T5rjK7ZyEB/iQsdhJXBDFzVJWDj8vT6nItO4uy2rpEEHHkwE+MDSie3guku9B48g SVtN1P7fbA9PVMM3JNQaG1vNWkSsAiramT+G4Y+izX+tJEV4MclPuzaeFrtAak+8JOjD hyOf4DKhtrIWSJkWY1wtnCW88oNBiiBI0avP5wrYBgUF2lyYX7tG45YlxAFNP9/t/OMU qLHQ== X-Gm-Message-State: AOAM530LZ1qIH0wX0FxBcNpMeDmccFv/f+pEkczwR4StSbWQU/UeovV1 aSiTJ7gSV8QZ7I5Ph38YE5N8jHIV/paPLg== X-Google-Smtp-Source: ABdhPJzhzjy2+FWOIlotA6Egx/zEya0i/cJiEg2OL81ZxqNJK/XoJLx+AkckgwGwbcl0/UGa8hy07A== X-Received: by 2002:a17:90a:f196:: with SMTP id bv22mr2158887pjb.155.1641360220614; Tue, 04 Jan 2022 21:23:40 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH] common-user: Really fix i386 calls to safe_syscall_set_errno_tail Date: Tue, 4 Jan 2022 21:23:39 -0800 Message-Id: <20220105052339.677395-1-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::1031 (failed) 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=2607:f8b0:4864:20::1031; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1031.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 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, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1641360313616100001 Content-Type: text/plain; charset="utf-8" Brown bag time: offset 0 from esp is the return address, offset 4 is the first argument. Fixes: d7478d4229f0 ("common-user: Fix tail calls to safe_syscall_set_errno= _tail") Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- Ho hum. I'm disappointed that our CI didn't catch this, despite cross-i386-user. And I'm disappointed that I didn't run a full manual build on an i386 vm to catch it myself. I plan on committing this directly. --- common-user/host/i386/safe-syscall.inc.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common-user/host/i386/safe-syscall.inc.S b/common-user/host/i3= 86/safe-syscall.inc.S index 9c45e56e480..db2ed098394 100644 --- a/common-user/host/i386/safe-syscall.inc.S +++ b/common-user/host/i386/safe-syscall.inc.S @@ -120,7 +120,7 @@ safe_syscall_end: pop %ebp .cfi_adjust_cfa_offset -4 .cfi_restore ebp - mov %eax, (%esp) + mov %eax, 4(%esp) jmp safe_syscall_set_errno_tail =20 .cfi_endproc --=20 2.25.1