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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 45920C3600C for ; Thu, 3 Apr 2025 15:25:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=qx2yJpdKBk1sp9DMnb8xdS+lVvvJKjbQIBB9Ta9Vfhg=; b=tmN82LrBI4t2yebiTMW6+ceO2+ d+ybl3/GgtCmNOYrzZ07aOhMCdNcHR7dwW2hUBAWr5K6MNq9LEfNPYPGJzq8PUcidJ+/4CA+LKC95 j12qiPvkqRp4ROgPjM+uHSVL9eWEGB0Agj+jaArbojQa5uVB3wsnrQe0IXN/sqcV1SDYMxBo7rqQV ACVLFPxAwVabe63Knq380wS3QYtHRm99NomH19UQRfKX7FmOTMzUp/ky96JQfqToK+1PJTKNeeTAw K55mjiUuAO6p1g8BROEno14ms8e0PlHsbJNJccAL5YGkQ0LLT1jjTwBLunztFj7ZOHrp931VfJE9W RKs1QpUA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.1 #2 (Red Hat Linux)) id 1u0MRC-00000009DsI-2xsD; Thu, 03 Apr 2025 15:25:02 +0000 Received: from nyc.source.kernel.org ([2604:1380:45d1:ec00::3]) by bombadil.infradead.org with esmtps (Exim 4.98.1 #2 (Red Hat Linux)) id 1u0MPK-00000009DUx-1cCX for linux-arm-kernel@lists.infradead.org; Thu, 03 Apr 2025 15:23:07 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 36DEEA438E5; Thu, 3 Apr 2025 15:17:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 68A42C4CEE3; Thu, 3 Apr 2025 15:23:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1743693784; bh=AUZl+9X0gq2/SFmm9H91W1TTTs0TgFnY6iXPYO6W928=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RpJnrpbU4tiuj+ACCd2QJ0JOtXHrkCuvFdsWra8BBXK6gscF9NSuU9zyNKSTcfuKd G4E52qIANlvwjjUV7lQxfEO1eID/HnSmyToLdp7CHN9jF/mxpFYh3N+FFO5Hckdnb6 rd3s3iSQVLFRn0RmDAdfI45NwnVNmsOry2LyHEIE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Mark Brown , "Russell King (Oracle)" , Ard Biesheuvel , Wang Kefeng , Andrew Morton , Ben Hutchings , linux-arm-kernel@lists.infradead.org, Kees Cook Subject: [PATCH 6.1 04/22] ARM: 9350/1: fault: Implement copy_from_kernel_nofault_allowed() Date: Thu, 3 Apr 2025 16:19:59 +0100 Message-ID: <20250403151621.074020689@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250403151620.960551909@linuxfoundation.org> References: <20250403151620.960551909@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250403_082306_517297_A923ECE8 X-CRM114-Status: GOOD ( 10.78 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Kees Cook commit 169f9102f9198b04afffa6164372a4ba4070f412 upstream. Under PAN emulation when dumping backtraces from things like the LKDTM EXEC_USERSPACE test[1], a double fault (which would hang a CPU) would happen because of dump_instr() attempting to read a userspace address. Make sure copy_from_kernel_nofault() does not attempt this any more. Closes: https://lava.sirena.org.uk/scheduler/job/497571 Link: https://lore.kernel.org/all/202401181125.D48DCB4C@keescook/ [1] Reported-by: Mark Brown Suggested-by: Russell King (Oracle) Reviewed-by: Ard Biesheuvel Tested-by: Mark Brown Cc: Wang Kefeng Cc: Andrew Morton Cc: Ben Hutchings Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Kees Cook Signed-off-by: Russell King (Oracle) Signed-off-by: Greg Kroah-Hartman --- arch/arm/mm/fault.c | 7 +++++++ 1 file changed, 7 insertions(+) --- a/arch/arm/mm/fault.c +++ b/arch/arm/mm/fault.c @@ -25,6 +25,13 @@ #include "fault.h" +bool copy_from_kernel_nofault_allowed(const void *unsafe_src, size_t size) +{ + unsigned long addr = (unsigned long)unsafe_src; + + return addr >= TASK_SIZE && ULONG_MAX - addr >= size; +} + #ifdef CONFIG_MMU /*