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 lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (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 F1E66C02192 for ; Wed, 5 Feb 2025 15:06:49 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [127.0.0.1]) by lists.ozlabs.org (Postfix) with ESMTP id 4Yp3VJ3jY1z2yhR; Thu, 6 Feb 2025 02:06:48 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; arc=none smtp.remote-ip=147.75.193.91 ARC-Seal: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1738768008; cv=none; b=OzTUt85I1GHlMXgbsIfar58zdxcZwBPKbD0SUqLRdIh4nz5lbbLSlfsVyuM1az/qNtvIUwr5ifsbXv+wXSo5+Jt2qcMe8TOWgUZHKhLZA3hoYI3G7vkU4y0JqQA5zkV7j68gbyBKVbt3FkSKcbJaOFL/fUf2XB2EQK4zbcWTOS8Q1HPzz4zMKtGsZBzXTWPPynEHNRqrVd6l4GKZ7ccBRiMgBzVDijFDrKLyhFjOJhgF2wDF6xkk5e824zQj1dVAwgv0phX/p0CMeaUyvqK6KlZPXV2JO99amVnZwLR5ANeBzEFXriLSD87ZyiL+6aAkdL0scBV07Yq7KIW7mAQ7qg== ARC-Message-Signature: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1738768008; c=relaxed/relaxed; bh=5YkwkkKBUQealGsYFOk/315Rfj3KgeIEP+NT3/XjpSc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fASnw67qDFTFIMp1YX3kO7hkO/59SLfFY2MI5gjQMgoZq4jjDesxePzdTDtvSRgEMjO7si/cqjx/HN0KunzeFjDwb6nG9iNvPp4eil4wy5We62TZoNqctiQt3O/CNsd7HWVqeNZteJYZPEw51/xXnCOUKa/HxavzOEYd65j0OjJ6dicJuiJu52cEvjBFnZ885hEnm5nEnDbkkWgR8j5w2PJUG7oKz1yb/JFvWEJVDFESwfHMahUmMgpTtiesyL/AFR7HSdUjaFNVgFGN9MAPdBNFwQRLM5EedcLEstKnmAvvxMe/R86Csy8NIS2+HVuLjkz7f27A/NzihkgwJvZWxA== ARC-Authentication-Results: i=1; lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=linuxfoundation.org; dkim=pass (1024-bit key; unprotected) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=oR3Ejf0+; dkim-atps=neutral; spf=pass (client-ip=147.75.193.91; helo=nyc.source.kernel.org; envelope-from=gregkh@linuxfoundation.org; receiver=lists.ozlabs.org) smtp.mailfrom=linuxfoundation.org Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=oR3Ejf0+; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=linuxfoundation.org (client-ip=147.75.193.91; helo=nyc.source.kernel.org; envelope-from=gregkh@linuxfoundation.org; receiver=lists.ozlabs.org) Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4Yp3VH2JSnz2xPL for ; Thu, 6 Feb 2025 02:06:46 +1100 (AEDT) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 57211A43753; Wed, 5 Feb 2025 15:04:58 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6857DC4CED1; Wed, 5 Feb 2025 15:06:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1738768004; bh=TLf4tgFsYIjoKgXw3qzkxj9YcjKyTRxmAjutopU04iI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oR3Ejf0+wdpBvEMpYdg0aCM0wHxZKGOUmXlFu5e/+pNq/wciGs2NIF1LoyRNpRaXq B48Y+E5/Fccx25wyXer06W5rS9eoU+vGBcLqilDjl/DoJvwpecI/kPFzqGPiDF7nU0 ENETZ66jfeZCGMTOYEv/+/sLo4jCYKuw1Oyz0um0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, "James E.J. Bottomley" , Christophe Leroy , Helge Deller , Madhavan Srinivasan , Michael Ellerman , Naveen N Rao , Nicholas Piggin , Sergey Senozhatsky , linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, Sergey Senozhatsky , "Peter Zijlstra (Intel)" , Sebastian Andrzej Siewior , Petr Pavlu , Sasha Levin Subject: [PATCH 6.13 483/623] module: Extend the preempt disabled section in dereference_symbol_descriptor(). Date: Wed, 5 Feb 2025 14:43:45 +0100 Message-ID: <20250205134514.696049230@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250205134456.221272033@linuxfoundation.org> References: <20250205134456.221272033@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: linuxppc-dev@lists.ozlabs.org List-Id: List-Help: List-Owner: List-Post: List-Archive: , List-Subscribe: , , List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.13-stable review patch. If anyone has any objections, please let me know. ------------------ From: Sebastian Andrzej Siewior [ Upstream commit a145c848d69f9c6f32008d8319edaa133360dd74 ] dereference_symbol_descriptor() needs to obtain the module pointer belonging to pointer in order to resolve that pointer. The returned mod pointer is obtained under RCU-sched/ preempt_disable() guarantees and needs to be used within this section to ensure that the module is not removed in the meantime. Extend the preempt_disable() section to also cover dereference_module_function_descriptor(). Fixes: 04b8eb7a4ccd9 ("symbol lookup: introduce dereference_symbol_descriptor()") Cc: James E.J. Bottomley Cc: Christophe Leroy Cc: Helge Deller Cc: Madhavan Srinivasan Cc: Michael Ellerman Cc: Naveen N Rao Cc: Nicholas Piggin Cc: Sergey Senozhatsky Cc: linux-parisc@vger.kernel.org Cc: linuxppc-dev@lists.ozlabs.org Reviewed-by: Sergey Senozhatsky Acked-by: Peter Zijlstra (Intel) Signed-off-by: Sebastian Andrzej Siewior Link: https://lore.kernel.org/r/20250108090457.512198-2-bigeasy@linutronix.de Signed-off-by: Petr Pavlu Signed-off-by: Sasha Levin --- include/linux/kallsyms.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h index c3f075e8f60cb..1c6a6c1704d8d 100644 --- a/include/linux/kallsyms.h +++ b/include/linux/kallsyms.h @@ -57,10 +57,10 @@ static inline void *dereference_symbol_descriptor(void *ptr) preempt_disable(); mod = __module_address((unsigned long)ptr); - preempt_enable(); if (mod) ptr = dereference_module_function_descriptor(mod, ptr); + preempt_enable(); #endif return ptr; } -- 2.39.5