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=-19.6 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 D2231C433E0 for ; Mon, 8 Feb 2021 19:46:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 87FE164E56 for ; Mon, 8 Feb 2021 19:46:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236351AbhBHTqg (ORCPT ); Mon, 8 Feb 2021 14:46:36 -0500 Received: from mail.kernel.org ([198.145.29.99]:47382 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235201AbhBHSDf (ORCPT ); Mon, 8 Feb 2021 13:03:35 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id CB9A664EEF; Mon, 8 Feb 2021 17:59:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1612807182; bh=Qrgn96LrMm5xRqQANseyCsxjhxCwOScm9LAMBr/qeWo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CqX2xkFg1VfeNJ8c0lcqWA1HPKRspflD0AMxBO1eBLw7grf7LZk8xEZTLshLBYZxl 38Gv0ctuj6IbkJ1ZG3JwFVEZ/Vfax9Fcs/YyWEMvJ41fG3KyyzW5YVow+fuRb1+S8F lG94bHyfSBRsZ+a+zPe2IVS2tOPV79Vd4cNWmrvF6Y5FB6PGpSOkHACAYdVjFRH6Hx ahEPss2JkIHN1SdEMUqHY04g3QYZpR65acf3HmVbjmGpdTtt4ZzJHisNrGWqMtq5Vc ugma2U5MwQCIoLp7GccHNs4QmzkSdRpgWEWLFJW09uo6MQSI2+iCf4KT8WfJbfDWNt G0rjjOduBsMEg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Russell King , Will Deacon , Sasha Levin , linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 4.19 12/14] ARM: ensure the signal page contains defined contents Date: Mon, 8 Feb 2021 12:59:24 -0500 Message-Id: <20210208175926.2092211-12-sashal@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210208175926.2092211-1-sashal@kernel.org> References: <20210208175926.2092211-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Russell King [ Upstream commit 9c698bff66ab4914bb3d71da7dc6112519bde23e ] Ensure that the signal page contains our poison instruction to increase the protection against ROP attacks and also contains well defined contents. Acked-by: Will Deacon Signed-off-by: Russell King Signed-off-by: Sasha Levin --- arch/arm/kernel/signal.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c index b908382b69ff5..1c01358b9b6db 100644 --- a/arch/arm/kernel/signal.c +++ b/arch/arm/kernel/signal.c @@ -697,18 +697,20 @@ struct page *get_signal_page(void) addr = page_address(page); + /* Poison the entire page */ + memset32(addr, __opcode_to_mem_arm(0xe7fddef1), + PAGE_SIZE / sizeof(u32)); + /* Give the signal return code some randomness */ offset = 0x200 + (get_random_int() & 0x7fc); signal_return_offset = offset; - /* - * Copy signal return handlers into the vector page, and - * set sigreturn to be a pointer to these. - */ + /* Copy signal return handlers into the page */ memcpy(addr + offset, sigreturn_codes, sizeof(sigreturn_codes)); - ptr = (unsigned long)addr + offset; - flush_icache_range(ptr, ptr + sizeof(sigreturn_codes)); + /* Flush out all instructions in this page */ + ptr = (unsigned long)addr; + flush_icache_range(ptr, ptr + PAGE_SIZE); return page; } -- 2.27.0