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=-17.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,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 A0162C433E0 for ; Thu, 18 Mar 2021 17:09:50 +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 388F464F1F for ; Thu, 18 Mar 2021 17:09:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 388F464F1F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org 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=fjXy/7ZhfPf8PpNIXvNapDUE/n9NG2ljz+xSXLwUCiE=; b=IY+DYwgtyXpHjO0KRhwAHvdAX YEXQvf7KYfmzaWG+w15KZkkrebaHtiiDZXuyweY12sNoERZHlPfS8W00+IpJkfplC/dEry0vIvyHA ImN2Nztw1CDqd2tm0D0ym3wv/799g9rjhIYWV7F8Il/vW1Ze3zNNGq7EehBeowNiYmp9wwiKPyWds SbPk2q5CGJFj4QMPEBrSImLSR8VZtIoxNzRpy1iK2fZIATmiBJv6k1DftSy0NFOqAvDQ3Jd592Dwz mf8l3ukuqk6TWsr9NivxyxGr+RfkyBKcJPjWNxX4a9M3sWb+dAbStgARqmtzLVbJcQ+tU4NzEf57T 3dJ55IlVw==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lMw8J-005epH-3l; Thu, 18 Mar 2021 17:08:27 +0000 Received: from mail.kernel.org ([198.145.29.99]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lMw7p-005emi-5X for linux-arm-kernel@lists.infradead.org; Thu, 18 Mar 2021 17:07:58 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8568064F1D; Thu, 18 Mar 2021 17:07:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1616087276; bh=KDmaDhL5z+l/yuRp06tDBxknJSdQk5//PBlGbYHsD8I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uXamTfM1e1nXPC+EzNOea+HK9mDtgfVqeGlFyYIl4TL1sfWVrQx2qBCPNEqZ3GkQW jLUYyhqAx8rhBB8uNrEUfW6O4qLHxSRvKP8oH9pqkJyBiSBMqqdhwfQq9uWK93r8tN PTDQg2d/C0z5NjTcT4U31thho1UivO8Mle/IWgqSRniIlTZ0TxZ/ECt13TLG6wbvRs kdQfAQi+1DymaDKwBdDe/vziK0QpiplI4HQv1M8Z89gAJjs+n8bc4OsmUDwt0XLkOm IyVmNf/jGcfJAHOJiD759cKRQaJaC7euHW2RrXGpHGAwXRQ9uuZ46ruTtWVgeDt/IU DHHFeXK407FNQ== From: Will Deacon To: linux-arm-kernel@lists.infradead.org Cc: kernel-team@android.com, Will Deacon , Catalin Marinas , Mark Rutland , Marc Zyngier , Vincenzo Frascino , Russell King Subject: [PATCH 5/5] arm64: compat: Poison the compat sigpage Date: Thu, 18 Mar 2021 17:07:38 +0000 Message-Id: <20210318170738.7756-6-will@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210318170738.7756-1-will@kernel.org> References: <20210318170738.7756-1-will@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210318_170757_420230_89E63282 X-CRM114-Status: UNSURE ( 9.83 ) X-CRM114-Notice: Please train this message. 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 Commit 9c698bff66ab ("ARM: ensure the signal page contains defined contents") poisoned the unused portions of the signal page for 32-bit Arm. Implement the same poisoning for the compat signal page on arm64 rather than using __GFP_ZERO. Signed-off-by: Will Deacon --- arch/arm64/kernel/vdso.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/arch/arm64/kernel/vdso.c b/arch/arm64/kernel/vdso.c index 16bf0b46fb70..159b72a646ab 100644 --- a/arch/arm64/kernel/vdso.c +++ b/arch/arm64/kernel/vdso.c @@ -318,17 +318,20 @@ static int aarch32_alloc_kuser_vdso_page(void) return 0; } +#define COMPAT_SIGPAGE_POISON_WORD 0xe7fddef1 static int aarch32_alloc_sigpage(void) { extern char __aarch32_sigret_code_start[], __aarch32_sigret_code_end[]; int sigret_sz = __aarch32_sigret_code_end - __aarch32_sigret_code_start; - unsigned long sigpage; + __le32 poison = cpu_to_le32(COMPAT_SIGPAGE_POISON_WORD); + void *sigpage; - sigpage = get_zeroed_page(GFP_KERNEL); + sigpage = (void *)__get_free_page(GFP_KERNEL); if (!sigpage) return -ENOMEM; - memcpy((void *)sigpage, __aarch32_sigret_code_start, sigret_sz); + memset32(sigpage, (__force u32)poison, PAGE_SIZE / sizeof(poison)); + memcpy(sigpage, __aarch32_sigret_code_start, sigret_sz); aarch32_sig_page = virt_to_page(sigpage); return 0; } -- 2.31.0.rc2.261.g7f71774620-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel