From patchwork Mon May 17 18:14:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 440210 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp1350529jac; Mon, 17 May 2021 11:49:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxi5faFLcdazrmDjlejobSh4sAgHdndHozcrYIqoK83WG7GBNTxVr31jJPrgDu8vG0lSBbx X-Received: by 2002:a02:c652:: with SMTP id k18mr1384875jan.105.1621277395065; Mon, 17 May 2021 11:49:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621277395; cv=none; d=google.com; s=arc-20160816; b=VBy1CLB8whCWJqULHIB235BQeHIlc/c7CLdmBbuhfM40u2tD5o7i5aNmhOCe2OyhKz +QhGpgvfQRktm5XVX6OHUN3hDS8r1r18IWKisn3uskvxbkay3n4ui8GtFRUVNAN0Rs4C 7pHSmkoyil0dvtAlR1hoeRlfoPLOWlulGwwXtHlcyN2JYT0cSFHWCHconupFPfoH8ARH JZGBi25l46+ihh4fkuamz1tve5UvuCzu5DWZTUt0POHty/zVa435Vpz/P6ezO4SE62ZE uLadE1WR3Vuu+Q9657QKF0ecPRQumwRf5jsJKhxgEz7Y9uAFJBe3zN27XqVf9KnnPXPy 8GLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from; bh=MKaTiylhNCjUv3zVUeGHxIwA0dfSM8mAfQL0F9dhnhA=; b=pIWUCEHU769ZJZb5JdEXTsHzJJnfZuL41Fs7ZqdrcTLZRb/Wkrk4ozcbxeAbG+s0Hi T/1flL/TZup+z+/G5ed8rgJrLr/4AeyGaphie4tnRO1ywvIeSBlXQBxQn3Wv5U5ZaYyV tfxs/CffoTMcWFrBV9JceALy/CiyMl4cuQeXnHrQ5krfJAQJXDLm1VZXyxSJ1SKae+R6 BQP+kJQXE4heHqpUiafgOFl0Qv1MwvWRZixTfNg/WgFV5eMzx6bCPl06BfnKTJs1ud0m nsIcYB0ZfjinqHyY48OGLsOrereYjaph9dyuHyCh+cFoS+OKFYp6790Qf9X81JYyybxN uLBA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id j8si7811783ioo.10.2021.05.17.11.49.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 17 May 2021 11:49:55 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1]:33382 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1liiJO-0002LC-Dz for patch@linaro.org; Mon, 17 May 2021 14:49:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34312) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lihm2-0006xk-VA for qemu-devel@nongnu.org; Mon, 17 May 2021 14:15:27 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:54695) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lihlZ-0004XQ-Ci for qemu-devel@nongnu.org; Mon, 17 May 2021 14:15:26 -0400 Received: from quad ([82.142.31.78]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1N6sON-1lPceM1XlX-018NzS; Mon, 17 May 2021 20:14:49 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 44/59] linux-user/s390x: Fix frame_addr corruption in setup_frame Date: Mon, 17 May 2021 20:14:09 +0200 Message-Id: <20210517181424.8093-45-laurent@vivier.eu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517181424.8093-1-laurent@vivier.eu> References: <20210517181424.8093-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:Bk/5lLQcvI2rN1VGUSy0LzFRnNRhVVNQeIJBDL16y+2uQuiqkKK LDLmwrt3bL+pSVkPWy4kPyLcfF2qvQQK6AmfuSllpf6NQsjpqVwIAzO2u7LcKMH1WNG+cX6 5qQLao4JUwHp6LWEKsoUv8IgLXG/I2KvwsF4QZ9R/AIQKlobwdZHzvAb4wRFrfUnJSprnwg eCWtVyetK9fPq/y3HgxRg== X-UI-Out-Filterresults: notjunk:1; V03:K0:oNaPiNjitJg=:As/06V9raLMf0hfhaF+uXs RFJhk5cubCF9qMAgJrZscYu04Ve+kEozKFVVKG8+1Ib4pNVy3uL1SwDeESahXmmkQGk/AChi3 wHDK0J4RrNDR1JUWTYMQmPa16eQrH0zwIKF5nTleAJJFwtf6HzsTmbxhCEyjqw4Rpq30c4/eA kKmqaM8v3LvirhwiwCiIPyqJBp0xCpBQ3Ja+FRDlxFTBn1Q6yFHTMZvHCQzJCihoL/gFSsafc r7LgtRk05he+/kmT5v4ruwzCOmsMrja3r0zmlh5c5PNSSZ+gyn7TtxrU6yAftGwZy5wGeWrq3 W0fxcJ8k6ABji9BE5QRATGoOUMPpMLF51HT3NtY3FMmYR3dHWVQw+8IA9LGHrshjDp3PsTLxX m8fXbyaSCkAb05a+q134GvKqc7mYvgwSzpZsaxJFVT0aYd6+Heeqcit6kGF1UPo71dDxHsFFW +yM/POB43CatufFvvnnIZJBXMQqFwNFjv3Luj3YSN4PstPiU+YYFJKeELYYqodJPwB+XqXAHh Tl/mzwwVxmx+WM5wteoNqc= Received-SPF: none client-ip=212.227.126.131; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=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: Richard Henderson , Laurent Vivier , David Hildenbrand Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson The original value of frame_addr is still required for its use in the call to unlock_user_struct below. Signed-off-by: Richard Henderson Reviewed-by: David Hildenbrand Message-Id: <20210428193408.233706-13-richard.henderson@linaro.org> Signed-off-by: Laurent Vivier --- linux-user/s390x/signal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.31.1 diff --git a/linux-user/s390x/signal.c b/linux-user/s390x/signal.c index bc41b01c5deb..81ba59b46af5 100644 --- a/linux-user/s390x/signal.c +++ b/linux-user/s390x/signal.c @@ -168,7 +168,7 @@ void setup_frame(int sig, struct target_sigaction *ka, env->psw.addr = ka->_sa_handler; env->regs[2] = sig; - env->regs[3] = frame_addr += offsetof(typeof(*frame), sc); + env->regs[3] = frame_addr + offsetof(typeof(*frame), sc); /* * We forgot to include these in the sigcontext.