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=-13.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,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 AC2F2C433B4 for ; Fri, 30 Apr 2021 20:42:45 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (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 376A1613DC for ; Fri, 30 Apr 2021 20:42:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 376A1613DC Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=gJRAfiS0aKjIuKmxDyknn118Ah0uW92koRuIPXAFZkI=; b=Uy67egjRbNdJpoPrcfKPGN2nN JjS5s9RnH/Lr2rCr1bTdypdQ1e195lXClF0lEdXN+DT1HiJVpf3i9GKnQ+tuhXyLavsJHtIkYMm8P n+Bfh4zGtxGrvb6GCl+6iavCVxba9rKUU0h7DRzloOwdPK59TAXT4N/Ee8PS0T0vF6TLX4lhO/UyO LCXREz5AHV+USsBmE3edkaywvXxc1x05i0gG7KDMzpAhHqB+6KkVuEJgmrvgtCfvDaG+IRHSyzMuM il3W54/tnJz5twju11jmFeQSXdEfLXa2UJD8BUfKBoMITcMzc4lhhKlWuXJS07qspQFVymQJJSXnG bUaFFfrkw==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lcZvh-008YVk-Pm; Fri, 30 Apr 2021 20:40:12 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lcZu0-008YEe-Je for linux-arm-kernel@desiato.infradead.org; Fri, 30 Apr 2021 20:38:21 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=5gtHRujbA++rmZKVlVKXeDrh5bnEaeS8o439txwjvSA=; b=kJUru+U4ZKe4W0AeZu+OkTsRub Rwm/uymXylnkB9ziKUPXkIoTmBSOZIzLRtIkpSTrCJ0g6mhUFELmmxL+HMzYua7xqkbiT3EDN/E/P zyYW7KK/ocyezpRpy+hTVjvwpJNoy2XQmVyttPTZloajvYdQknQHlD37ZL1cS/r4OlY2gLqB5+zxf iQxaS8wSAD9Vgr8oOkaJ7edFBC2GZqcX4Xpx1Z0V8LP+RpniEBkJ72szDiVqZ4/E6x09HNnDEKnZp thY2fRcHAkgdItF1MsprYuMPyuQbjomh5HE0Mj8ZVa0BFRl74KG858YcR6A65hX+I1DImNz0foDN+ UhT4tIvg==; Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lcZty-001el8-6n for linux-arm-kernel@lists.infradead.org; Fri, 30 Apr 2021 20:38:19 +0000 Received: by mail-wr1-x42f.google.com with SMTP id a4so71979081wrr.2 for ; Fri, 30 Apr 2021 13:38:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5gtHRujbA++rmZKVlVKXeDrh5bnEaeS8o439txwjvSA=; b=qrc9+H+zO876EkLivwIh9Kjb21xwQnQtJBzxM3rkdwjm4Tx/1PWcOzQJ31sktAcNc+ MS2EYrIX7e4Ha5MfqiquAQCZiF89vo4q1ATmaBX4I03ihWSEYKYZ+9/8ry7nO8WEQ3u9 P4Nxj/HAF9l5SeDf9pVrHab0IckshPm7R+gfqxPNpk3hrOD4ViAt9JyKDFK7XvJ1yEPf bWA0pBQTrNJxxeA0ycbVEOVMt8IHEtmHTGdQE35HPvhtUnmZSV2U7vfjdQZYnaR//ldt EmzBA6zSaqGrQg/UBR0GCohMlPFdMDG2a/Y4JC1TUMT6hyBUXGnVW3FH1btv0f16Arm9 WMyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5gtHRujbA++rmZKVlVKXeDrh5bnEaeS8o439txwjvSA=; b=PGfocYxb/3k7e/Lt6F8Hh+EDwPvfyuuQzDZNWxQLoKPbUgpJhpzI583Mx6P5rY5Ig/ Eb6q7PzS0QsTM5QQ93Y1Co4uBYIikVfUAX/CDe2CrdYWvNuRBeKzwFn87KT2Iq4G387/ eXrtFz3eFpCpnWnvErkpUPdogSh2Of8Gnxy5MCYSRc0TPXuFZkycQS2zH/5H2VH0uySE OWLRZ4+p0Oza0IagFAByo/F5YHZH2KLxrh3eea0SiOAoQXSOa/KCTLaDe/EIXVCDMsqi FzNtuXRMZ37loB0MTXVn7iXGdllYZJFe5U+fZy7LDgXKXtogHftEEq5QOk+kBq08CfVI NjDg== X-Gm-Message-State: AOAM532+aZG1HFUV/bDcLE/cKaeIgHfFSjzf/Mw9a2/rAHwVNg6Xj7El Z/WoioMWx50wMi5Uk+/MgNE= X-Google-Smtp-Source: ABdhPJyQ4TvSmcF9Tde8UDMJFkkUIiijwF8XDq5CyinKCWjBHcnk2B6L/sJrUzcul6NzYJNXMUCFGg== X-Received: by 2002:a05:6000:18ae:: with SMTP id b14mr9357812wri.211.1619815096507; Fri, 30 Apr 2021 13:38:16 -0700 (PDT) Received: from amanieu-desktop.home ([2a00:23c6:f081:f801:93ef:94e:9f8:1f0]) by smtp.gmail.com with ESMTPSA id r5sm4384239wmh.23.2021.04.30.13.38.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Apr 2021 13:38:16 -0700 (PDT) From: Amanieu d'Antras To: Cc: Amanieu d'Antras , Ryan Houdek , Catalin Marinas , Will Deacon , Mark Rutland , Steven Price , Arnd Bergmann , David Laight , Mark Brown , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 7/8] arm64: Forbid calling compat sigreturn from 64-bit tasks Date: Fri, 30 Apr 2021 21:37:56 +0100 Message-Id: <20210430203757.47653-6-amanieu@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210430202810.44092-1-amanieu@gmail.com> References: <20210430202810.44092-1-amanieu@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210430_133818_263571_33BC62F9 X-CRM114-Status: GOOD ( 12.81 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org It's impossible for this syscall to do anything sensible in this context. Signed-off-by: Amanieu d'Antras Co-developed-by: Ryan Houdek Signed-off-by: Ryan Houdek --- arch/arm64/kernel/signal32.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/arm64/kernel/signal32.c b/arch/arm64/kernel/signal32.c index 2f507f565c48..e2bdd1eaefd8 100644 --- a/arch/arm64/kernel/signal32.c +++ b/arch/arm64/kernel/signal32.c @@ -237,6 +237,10 @@ COMPAT_SYSCALL_DEFINE0(sigreturn) /* Always make any pending restarted system calls return -EINTR */ current->restart_block.fn = do_no_restart_syscall; + /* Reject attempts to call this from a 64-bit process. */ + if (!is_compat_task()) + goto badframe; + /* * Since we stacked the signal on a 64-bit boundary, * then 'sp' should be word aligned here. If it's @@ -268,6 +272,10 @@ COMPAT_SYSCALL_DEFINE0(rt_sigreturn) /* Always make any pending restarted system calls return -EINTR */ current->restart_block.fn = do_no_restart_syscall; + /* Reject attempts to call this from a 64-bit process. */ + if (!is_compat_task()) + goto badframe; + /* * Since we stacked the signal on a 64-bit boundary, * then 'sp' should be word aligned here. If it's -- 2.31.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel