From patchwork Tue May 18 05:31:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 441154 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp1800727jac; Mon, 17 May 2021 23:17:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyeUbfhahc2EPcuAJpw9Vo90qwrNz5GIk9wvhgf2KTumc0hpdVgmKXLn7Oq9jQvudhBwV62 X-Received: by 2002:a25:ad9f:: with SMTP id z31mr5007791ybi.130.1621318640901; Mon, 17 May 2021 23:17:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621318640; cv=none; d=google.com; s=arc-20160816; b=voWfKaNiOgiiR1OIroxRjnhz7dkB9+UAHjJoirKvHXRwOeNKS9sZ+BZg+r2V/BMNvC UtPFX/mCKah2XsREecpYyUKMmsskDkthZxgKqDD7yFc7U4EQEEQ8vi32Tjr69ByPOZOT ixju7r0J6R4uOYi3kbXnXqJGTSvxtyVpsTkaAHwOaWy2FdfbU28H2qHyHioxt1IfoRj2 D/APzEKMcdYCsuW52PzL3DNIn1nZBptcbmGTYqO9tiZOhEI9unLS8ls5qxXfazKwtVdI IJFK8InDkS6utJz5bB1qQV+OovJuDedbfHWWL8VqaBpqjgy5xwWpRaHGYcc5bVqQIz4l 04nw== 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=PezQU/V5vaV13mfI/ikjqnDqpZQd3WGNM4J4f5S2XNWC0k/aqvff9H2/8N3Ifvx4fv G3K+Po+fcG8hlxqAhwe2TeS2NZ78gucxaeaF6Vz+7XVuRGogCPW3zzhdaKDVyaQRLK7N IABD0XJyZuh+3HKpQR+XsMr8+IJddaeA+nsIYLq8jOFKw7/N71SHJfOvM2/dmjr1XOTW J3IOQbmcQfpUxHo4NDnP11/hrwEgiU1UadK0VW6yRN/FRS9OJXgwFjt32lCqCMeIkYQX hN+kLSjNnrmhbj2UuXgNE4PT2zBCfQaxWyzvE6Aw/jQBxu7sJmiCxvqzdSXOHXEPpf9Y pCtA== 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 u17si2070190ybu.151.2021.05.17.23.17.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 17 May 2021 23:17:20 -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]:38850 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lit2e-0007oq-D1 for patch@linaro.org; Tue, 18 May 2021 02:17:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38814) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lisKs-0007rv-O9 for qemu-devel@nongnu.org; Tue, 18 May 2021 01:32:06 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:35477) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lisKn-0007AW-3C for qemu-devel@nongnu.org; Tue, 18 May 2021 01:32:06 -0400 Received: from quad ([82.142.31.78]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1N4eOd-1lIrRE3dxP-011mCv; Tue, 18 May 2021 07:31:56 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 44/59] linux-user/s390x: Fix frame_addr corruption in setup_frame Date: Tue, 18 May 2021 07:31:16 +0200 Message-Id: <20210518053131.87212-45-laurent@vivier.eu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210518053131.87212-1-laurent@vivier.eu> References: <20210518053131.87212-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:SZ7kuAOZ0C6B91UsjZ4NYREWa4kcI9+Qh+fUMvnTFnFh1Qgvhfh LRJpoFdflRaNVwO22o50ZCKPgDLrjlkYGYgU8KlQDTboqYVNaRKBnz+ecwY5Sryu5dFxxrx ruUKXmGnMDXtT3xPDtj44lz4QjABz/xfIP+9FkH6/meSWGBvnn3jsWmBSLsJ3Pph2R1RudY iHFT4ypIXxmtmHpVJoBRA== X-UI-Out-Filterresults: notjunk:1; V03:K0:EgUM2E7ZBaQ=:CbPm2d6+KlnQOnQXdK/XnT /BxNIlpkYwLP5kYRAhFBq+tmIl8ayigwgeakoF6bKJAJWq2rPWbRfj98pMXxr5ngY+2iSx6IS ljcKzNde2UhSCLdPLkoqsO2rZPbonbxpBw1zV7CqTaSa3nPatU4I3TsYlkmq+v+YT+i2aQ2ZE w6JevCbUv4fLUVCJ9F5F1ai/PA6fx4be+xb3kIYtwxkP3f0KV2fjzEAjhV23KPrBIxqzWpe8Q BSpUBmOi8sq/pqTwL3Y1Mzv2hPSEU5Ey518hmgHioKV3CvvHsjc7wgLxgqG3xPefbFs7zd3WQ rxnLzx+Q5RSTIwsDvCwkx8oTCDYGOmpxySlOODBvx0zYyFeU/VQzNJhbjHqn/ATa8odt0LXrc oQtgSzW+Cb6PS7sbaphBdTF/320J46LWbtv7bLfQzHMJDSfN7Il40d4NRp3TnLEYHuoH7TVoG rN6Z0fLOTRVOSsnCeYABrsUj1M58psqCR23qBeA+GwiaV7xvuhWj9aIgNWztTox9g+lUTgkYg FIj9E9P2/7kSHmgonByZG0= Received-SPF: none client-ip=212.227.126.134; 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, RCVD_IN_MSPIKE_H2=-0.001, 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.