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 AF541C021AA for ; Wed, 19 Feb 2025 09:15:33 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [127.0.0.1]) by lists.ozlabs.org (Postfix) with ESMTP id 4YyW2W6B8gz30ML; Wed, 19 Feb 2025 20:15:31 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; arc=none smtp.remote-ip="2604:1380:4641:c500::1" ARC-Seal: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1739956531; cv=none; b=dXs9JPmt2/Kv0h61XhBBoQubCkgXvq0L/tW+IE7cboe1xXbiCMUI2XZsPpHoVuvLWi82bChLNbf5GcV1nIJOZkpnPUy/f3l5zH/8xZ5QDhAT1t0DVoEBN1VmnSIuLYEEkXhVbj+Y6HuhXJX9iY87pQdUv7yvjBZgoolfcv13BdGdWF51I0eypNVJXxVhRrxPGaDrnLiKl5Z6wPF1aB/Ij+njqDIQhPi3FoZN2POZ2WUxqsrd7qjx0JRnUbBrZbwaHKcHn/d2pZOUSk6Jf7UeCxe93VlyFtfEK96kmtIw2Dgq2AbgKIer+tmor3PrzhbfHXCLzpnt2qntm90yJH8GgQ== ARC-Message-Signature: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1739956531; c=relaxed/relaxed; bh=KNA7uCX8taPxQB3NnGpDZ2C+lpLCK8GHBKWNUfMBbx0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CbXJyqUov6flW4HbHIA1cQDb0pGfcPCa4K59l/x9HK/P8jcL7CNe9mKwg1Mt0KsIUyaT1O9Dvwg/gWVGk2WiOv2DFooN/QhAupwlV5b6Bda/6velTQ0Tq3/ITeCTviY46jg4Bm474+2K0R9KMmIma5KjyQleya7VLAJ5AQWDDAE21zuh/Tu6h70Pyd1dDdG54DbYi6gJpIFbbGzIVIVcSB9SJZPuKVrk8B40dHUeKz3hhYCA+3B1mnBkcNElmhBjgNbTXYTXniNKIV/UbCeOg0aBh8JTm0l+1mEi1W5VczLQsfP/9YBze6fGGFGiy+b+kfyeBLFyyl1iBzhgblQ4uQ== 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=Y8TRMQcE; dkim-atps=neutral; spf=pass (client-ip=2604:1380:4641:c500::1; helo=dfw.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=Y8TRMQcE; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=linuxfoundation.org (client-ip=2604:1380:4641:c500::1; helo=dfw.source.kernel.org; envelope-from=gregkh@linuxfoundation.org; receiver=lists.ozlabs.org) Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4YyW2T49t2z2yvn for ; Wed, 19 Feb 2025 20:15:28 +1100 (AEDT) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id AB8C75C4672; Wed, 19 Feb 2025 09:14:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 156F1C4CEE6; Wed, 19 Feb 2025 09:15:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1739956525; bh=CsTBlu4PxzMm58+7iDpVQaMfkefep16Cd8DGhQ3z9z0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Y8TRMQcELYUxVdPvJ5lCUInj7sehoS/tSEJHfwcgDlEQPwtucx3AA+KBVFj1bOx7d xuDoCnYn0UHEI29pXCaKs5+wJTVIPUq0deaPX4q5qcZ0y5RBjuES/3cDmerKfl79HM 5nBe1SaYkDKv0EKvPyg3TaD2mCXTdekq+9UOcRJg= 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.1 207/578] module: Extend the preempt disabled section in dereference_symbol_descriptor(). Date: Wed, 19 Feb 2025 09:23:31 +0100 Message-ID: <20250219082701.205158327@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250219082652.891560343@linuxfoundation.org> References: <20250219082652.891560343@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.1-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 0cd33be7142ad..6d10bd2b9e0fe 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