From patchwork Mon May 17 18:14:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 12262907 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 0BF69C433ED for ; Mon, 17 May 2021 18:56:37 +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 AEC816109F for ; Mon, 17 May 2021 18:56:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AEC816109F 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]:33062 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1liiPr-0004BK-Lb for qemu-devel@archiver.kernel.org; Mon, 17 May 2021 14:56:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34322) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lihm4-0006z0-6j for qemu-devel@nongnu.org; Mon, 17 May 2021 14:15:28 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:52007) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lihla-0004Zd-9e for qemu-devel@nongnu.org; Mon, 17 May 2021 14:15:27 -0400 Received: from quad ([82.142.31.78]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MI41P-1lf58V34Lf-00FAwA; Mon, 17 May 2021 20:14:52 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 51/59] linux-user/alpha: Fix rt sigframe return Date: Mon, 17 May 2021 20:14:16 +0200 Message-Id: <20210517181424.8093-52-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:PDrwoQWrAJ5uiLKFzRiKLygC5ZQN+i5naumYjs2xRijmcAuAgeH nu2qW1H3t8/DN5mqgxm36WLmjdKYEMQ/v+t0P6UE4ZlqxzEjeOKf0P/R4H+Ug/5GVVQlngC YupS1Zdu9RgTME7yS39TNwkjwbB66epmzIMAi7l4bhApuy6bwYiNnuQODbrq3RSoO5ARy4V D+O5W+22OXjX/pH4sRhcw== X-UI-Out-Filterresults: notjunk:1;V03:K0:KoGqCJkR/34=:2whZOlpfd65nD1CZDoaNvU XxmH+hm0IEyLNlSUg7b+vnzJy5HPAkTm2/4+TboVIl20qZfnoXNixk3wZNKs/LZ++T6zgYf2G 7xRLgeXvFtSSQa2A3rfK7rrv62ZyIB7fsrWBlVGdeEn6j27l+FtmNoAACQtiHwuyOWSb82979 wQL9+GodD+lzYDpbZZXgwTnJUe3A2y8JjoXKv88T+Px2RcS9MShOLrJyC76LJ/0nRydvLER/0 00fyliQQJRSgYM7Ud2YB/LGm8aFNgQ1Q8eP7vopEAiGj1YHn2fdeOgPgxK4esbIBi4TxVWSrs 7S6uEcTgDM8f7C1L3gvrDNEWT+P1L8Qnp2wVwADeBRA8zaoDTtYQjbGMXxHyggmhea9hWHzQu WAFSrQxN5FRVfHRsBNTYiwhU5hAnmb+yUNgHu049rLoqCg8KXukiPcYUstrggxkCxGzijjY2E qgoAjd/k9LIrZnbaPWgGrOfQqaBWb1MpKNdqDWGRvaBDi4d16VzrYux/6cDAYJZU+m58ynITU RyxfWNugdp8iAGMfwOvACA= Received-SPF: none client-ip=212.227.126.130; 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: =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson We incorrectly used the offset of the non-rt sigframe. Reviewed-by: Laurent Vivier Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson Reviewed-by: Alex Bennée Message-Id: <20210422230227.314751-2-richard.henderson@linaro.org> Signed-off-by: Laurent Vivier --- linux-user/alpha/signal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-user/alpha/signal.c b/linux-user/alpha/signal.c index d4e4666874e3..0eec9ba3fd82 100644 --- a/linux-user/alpha/signal.c +++ b/linux-user/alpha/signal.c @@ -200,7 +200,7 @@ void setup_rt_frame(int sig, struct target_sigaction *ka, &frame->retcode[1]); __put_user(INSN_CALLSYS, &frame->retcode[2]); /* imb(); */ - r26 = frame_addr + offsetof(struct target_sigframe, retcode); + r26 = frame_addr + offsetof(struct target_rt_sigframe, retcode); } if (err) {