From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6CE6010E996 for ; Wed, 15 Mar 2023 09:41:26 +0000 (UTC) From: Dominik Karol Piatkowski To: igt-dev@lists.freedesktop.org Date: Wed, 15 Mar 2023 10:40:39 +0100 Message-Id: <20230315094042.5032-3-dominik.karol.piatkowski@intel.com> In-Reply-To: <20230315094042.5032-1-dominik.karol.piatkowski@intel.com> References: <20230315094042.5032-1-dominik.karol.piatkowski@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [igt-dev] [PATCH i-g-t 2/5] lib/igt_kmod.c: check if module is builtin before attempting to unload it List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Isabella Basso Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" List-ID: From: Isabella Basso This change makes `igt_kmod_unload_r` safer as it checks whether the module can be unloaded before attempting it. v2 -> v3: - Fix commit message - Make return value clearer Acked-by: Janusz Krzysztofik Signed-off-by: Isabella Basso Signed-off-by: Dominik Karol Piątkowski --- lib/igt_kmod.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/igt_kmod.c b/lib/igt_kmod.c index 0b714ce3..fbda1aa6 100644 --- a/lib/igt_kmod.c +++ b/lib/igt_kmod.c @@ -259,6 +259,9 @@ static int igt_kmod_unload_r(struct kmod_module *kmod, unsigned int flags) int err, tries; const char *mod_name = kmod_module_get_name(kmod); + if (kmod_module_get_initstate(kmod) == KMOD_MODULE_BUILTIN) + return 0; + holders = kmod_module_get_holders(kmod); kmod_list_foreach(pos, holders) { struct kmod_module *it = kmod_module_get_module(pos); -- 2.34.1