From patchwork Mon May 17 18:14:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 440217 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp1353160jac; Mon, 17 May 2021 11:54:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzzbwKrTwo8N6Pc+y0EHpjEKhoKrdPto/JsVZKy2L9FQF9jeQvm7WJC99BgjlW4gTIY2mrt X-Received: by 2002:a05:6e02:13d3:: with SMTP id v19mr988449ilj.168.1621277660923; Mon, 17 May 2021 11:54:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621277660; cv=none; d=google.com; s=arc-20160816; b=tpde7EV8cVBwcWFIYwiG9auAoCW05fRlgEjgVRFJ5wnPIsQloda2D+xP/pBx85JPOg TMg6ueY16wBsHrVz+zCHpORIW0L94ZL5O1czZHdtyXimgn6cX1pQiCoJ4M+5Aq3FCQhB 14wsL5q3ejwLzv/sYi7LQzpt3994GOrgiy+Q6YsFAlrLAlz0LqGYNcw946ZVXA4PGoUW L+opF80u/GzdPH+o1+5E8s2QRFs042LpbEY9pKrtO+4Y6+pTdhwTbpNB5WNM0g6n+a1n zDeFDAfgPt1D3Rzk/13VlVWK0QKc1TPqjvm5NmPJjeH1UZUTC7JEV7X927IJSkag7ARO K6ww== 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=KwT2AKgZHezFIvCf5CFVAJxflDRN58W0gf8ZoImqk/s=; b=tPwrJ2dXJs/j3OVxcWpNB62vskKzm7HIKOAAuMfE20n5crqR9ukxw0qaHO4y0ZqLc1 oJ4zW8ymeL5Dy2vP8VPOoiIpJvUQN0X2QZG1bykxrrwboKvDRSAVgQi3WLPWk5ynGTjM Z2TcregQpYaMeYkNakJq1LOiMq9P6w3/KxxrkUOgz1IkJXaHKh8GAljLJZxGGXrZXTl5 y9iw6CUsXgNjwA9E18ddqRvO8r5A5JZLA1EmtBo9IwHEIiVutfeth7EfICd+WlG69WJc BRRZ/4cABRNAz5NL4aZz3s8rLsVS38IZtqcdE5TL8b1mdnkARpjl0uSj5wu6PaUkfU4r ETxQ== 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 u15si22682166iot.55.2021.05.17.11.54.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 17 May 2021 11:54: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]:50112 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1liiNg-00056A-CO for patch@linaro.org; Mon, 17 May 2021 14:54:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34136) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lihlg-0006kE-Tc for qemu-devel@nongnu.org; Mon, 17 May 2021 14:15:05 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:48655) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lihlT-0004Vv-9J for qemu-devel@nongnu.org; Mon, 17 May 2021 14:15:04 -0400 Received: from quad ([82.142.31.78]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MuF4v-1lUcrD1jCv-00uaUe; Mon, 17 May 2021 20:14:46 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 38/59] linux-user/s390x: Fix sigcontext sregs value Date: Mon, 17 May 2021 20:14:03 +0200 Message-Id: <20210517181424.8093-39-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:blckr7dxOt6fnn2c3pCRwPDgp5g7P1ua3NjcL3r8XgPzah913oK BNk7o563760D+qv9v8cBEbtNK/s3GFdM0Xogv7y9ofR/nDRtEItR2h0ThkbgWoTXVh7o15F Qk8nn2OzaHTng1FR+kXUPdb6cMVUUhYGYh5yb13H842+v8dyeRnpGxNVNwMRhtMId3m7yru 6Uw9i18vHcXWmOZBswJbg== X-UI-Out-Filterresults: notjunk:1; V03:K0:ge27jKV5ccs=:nJax0jS16w/hYU0/2ZNwr2 C+FKcejJGgvMHWAvjS37mhWAuTgoDRXPrkUGdQ3AVcZc9WeHfUp72yBpz1pLpUVdXkjRVejoP vws5JSqdKLK5r3kw0nX0H4x+gD+XGXqcQjsw5X3cIp6+NR3uHkSnOWrvoeXTouw2HHNztJ5p/ 7EWfdrhYmeA+lSdkhECzevk/PDCOVa6YCgTMUozm7y9yDRWJGFVIoPVCpP55++kNDDEW04R2V 23OV/tKPbN+2RZXTXu4BNfFPCqRagMwufhj0t7eWScoZjWEsgf8aWcJQC8YkK9efwC+0dguGG DI8IqAxMQj3IXP9pW4QTXK+N6IQEHNVf2nvJDirz09ibacbGNeerUBqcAmcijvnG4ft21H8sI yEcPkR4rbjk2sg6HrCF8xJi1qZV9m+K/n7xHYX37FSmOMTquVeD+9EbhFmLvM94wx2pQrc02D FB8oqoovE6U3nSyA+VY3A0avZcAsTrT+YRWQlNMD0XQLBebUg9yptA5u+hbXbgnKmlZqlixwo O+2YIQ6ZQtJR9XE+zM7rnA= Received-SPF: none client-ip=212.227.126.133; 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 Using the host address of &frame->sregs is incorrect. We need the guest address. Signed-off-by: Richard Henderson Reviewed-by: David Hildenbrand Message-Id: <20210428193408.233706-7-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 dcc6f7bc0274..f8515dd3329b 100644 --- a/linux-user/s390x/signal.c +++ b/linux-user/s390x/signal.c @@ -142,7 +142,7 @@ void setup_frame(int sig, struct target_sigaction *ka, save_sigregs(env, &frame->sregs); - __put_user((abi_ulong)(unsigned long)&frame->sregs, &frame->sc.sregs); + __put_user(frame_addr + offsetof(sigframe, sregs), &frame->sc.sregs); /* Set up to return from userspace. If provided, use a stub already in userspace. */