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=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 A362DC433B4 for ; Mon, 17 May 2021 18:50:13 +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 58C0C6100C for ; Mon, 17 May 2021 18:50:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 58C0C6100C 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]:37416 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1liiJg-00050p-DQ for qemu-devel@archiver.kernel.org; Mon, 17 May 2021 14:50:12 -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 Content-Transfer-Encoding: 8bit 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+qemu-devel=archiver.kernel.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(-) 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. -- 2.31.1