From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DB435606A320 for ; Sun, 8 Nov 2026 22:40:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20260707 header.b=nBdtVhcK Received: from boromir.ozlabs.org (localhost [127.0.0.1]) by lists.ozlabs.org (Postfix) with ESMTP id 4jN7CF4r1cz30C9; Mon, 09 Nov 2026 09:39:53 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; arc=none smtp.remote-ip="2607:f8b0:4864:20::1346" ARC-Seal: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1794177593; cv=none; b=gSWVo+iIUhkA/lgthlFJMOQu0vXhhFd8ja87ijayBqtlQEMUNCEjWM//y05VyaTYczfP1fqurP5bm4XYvQWS2fJ/zG1EFbSSoouq2/6UT6i7qUWYbdiatsWg0TO7FA/p9UYa3YdJTM7PwJH6oteYn9a3ondLyZwxN5s9/Ftni+DpmFMY9O8AI22JZSwp1gl8PIaqOCrfEaFaJht9We6yvO22rOvNCsC42wy9uNpwf1DHVGw+28/vlWm/XRyFCGO95fKU1/YTXly89jIAgoIR/9WqnUu8ljGa+N44tqHweJNrwRUvw+o1kjHbJZcOI9LRARILjihsTmAnafxCO5/xsQ== ARC-Message-Signature: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1794177593; c=relaxed/relaxed; bh=m1jLuLVTWvALNpXpZUUQEWDLYzqr+bz7MlMjOt9nJBI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=bv4C96NYpOjQOS1bQbMbpCVS4gOL6vZIRFFNceH7YJR7MgXjnaT5V+HEWS6Qc0PtNHgO7lKiQwZM58n/OeDXtI+SIkVD9bau3GfkfKGz5K1xbvUAsF6bEpWI39F2lCq5BwKrOOvHgKzFrA7g6kfXbG0yrbhzZbdiBffI6TgmdhD2BUhjVPUzilHtFxwoKtir2x1jcDltLpfD6//PXjjK8Rvd84aJuQjbYy07Gbg5R+3jxU4MYnPgw9iqxEnKO9cEPQ3z+j2SuXCjNfkGbTGlycglieXksiGm/t/LobFTysOFN896J3aVyMUbxvYafH2ejAMTvI6ILIRSM7vSYssgvw== ARC-Authentication-Results: i=1; lists.ozlabs.org; dmarc=pass (p=reject dis=none) header.from=google.com; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20260707 header.b=nBdtVhcK; dkim-atps=neutral; spf=pass (client-ip=2607:f8b0:4864:20::1346; helo=mail-dy1-x1346.google.com; envelope-from=3nvrwagckde0x63vt67v33v0t.r310x29c44r-sta0x787.3e0pq7.36v@flex--irogers.bounces.google.com; receiver=lists.ozlabs.org) smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: lists.ozlabs.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20260707 header.b=nBdtVhcK; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=flex--irogers.bounces.google.com (client-ip=2607:f8b0:4864:20::1346; helo=mail-dy1-x1346.google.com; envelope-from=3nvrwagckde0x63vt67v33v0t.r310x29c44r-sta0x787.3e0pq7.36v@flex--irogers.bounces.google.com; receiver=lists.ozlabs.org) Received: from mail-dy1-x1346.google.com (mail-dy1-x1346.google.com [IPv6:2607:f8b0:4864:20::1346]) (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 4jN7CF0rsvz2yd7 for ; Mon, 09 Nov 2026 09:39:52 +1100 (AEDT) Received: by mail-dy1-x1346.google.com with SMTP id 5a478bee46e88-36d69ab3c2bso464100eec.0 for ; Sun, 08 Nov 2026 14:39:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20260707; t=1794177591; x=1794782391; darn=lists.ozlabs.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=m1jLuLVTWvALNpXpZUUQEWDLYzqr+bz7MlMjOt9nJBI=; b=nBdtVhcKyEpMMKCWQkV9rlJhSiHcYArKds7u6AWXQIstsP0TU7waie1Pmj7sdPCh3v xR6uJ9kWMNqSLnPPtri2toSoQXmu0UABb4Cn1CKOjrJSILYIlDxPiHjVLAvxscW8pOxG e6nu3dKFY3hI4Mi8jVIbZ/fJDtVHjNN3qgQHB36AZI06XJ2sfancGJOUrV+25dJiw6Q8 GveoBADj41GdenV3FStt6CE/r1LkF5v9KHjq8MpPqvMGTotcYvZS5gtHDAyTd6zzzDkt 3TZPTt6zqBklfOgqf5kWoMhnKosLY/j8+deN1wHgBnhQE0QzDsgB7qH7vKieqGY5YmYK sCUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794177591; x=1794782391; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=m1jLuLVTWvALNpXpZUUQEWDLYzqr+bz7MlMjOt9nJBI=; b=GgukrAgq6MTH7LW/oSbbgzFy97FgT/XH0ELMq7L9hNZkO7n+muqsjWQI5jq00Kf9nf rLl5VVimxtBvgu8cf2W3Ox2T9CE6O3s9N8LZh5cbBO3cRmR2zrbtI3BcO5d6JQ8ydLCw yR/0qDBmed6rS8TGeTa4jhM1cHJ5TWgcXYFjFvcJ6Q81s1bo81M5iKW2pOa16uprl7qK gXhxSMGgfak/X/Wg+L1DYVB/rdB25x5gy01BKzvGiRSvNHdguNnfs1RezCAJS16cwVZP F0jU2iGWejdbZ4Dtsnzh0mMgF9b+2hDDIeQuAguYOnZ7RDMX+a2nXkO5EmkewlyuWy9t g9lQ== X-Forwarded-Encrypted: i=1; AL+hErHnhw4z0CVbChBE33KUutDCN9UUerKzI/V9H2PaiKGn6JTL5przGUYkDDJNPS94TJLyke/K8+iD3iIJoN0=@lists.ozlabs.org X-Gm-Message-State: APuU4Z9Q53ibvk3oJD/OVRZgJ27JhbirK+QMuqOUvTLiZVu3WVQV4L5+ EntspRcIOBOj75pMw3kJGnmk1GH1UhkpWf/KrU6N522xu/QI64/8aMVPEa8TZ/1u0WaK/YNyD2C NQmseo7Jm9g== X-Received: from dycmv11.prod.google.com ([2002:a05:693c:280b:b0:36b:c499:531f]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:693c:2806:b0:36b:f09f:924a with SMTP id 5a478bee46e88-37256bef587mr4546874eec.14.1794177590507; Sun, 08 Nov 2026 14:39:50 -0800 (PST) Date: Sun, 8 Nov 2026 14:39:09 -0800 In-Reply-To: <20261108223913.3624571-1-irogers@google.com> X-Mailing-List: linuxppc-dev@lists.ozlabs.org List-Id: List-Help: List-Owner: List-Post: List-Archive: , List-Subscribe: , , Precedence: list X-Archived-By: Mime-Version: 1.0 References: <20261108223913.3624571-1-irogers@google.com> X-Mailer: git-send-email 2.56.0.455.g6c5a503b38-goog Message-ID: <20261108223913.3624571-6-irogers@google.com> Subject: [PATCH v3 5/9] dlm: Free dlm_ls in kobject release callback From: Ian Rogers To: Danilo Krummrich , Greg Kroah-Hartman , Kees Cook , Miguel Ojeda , "Rafael J . Wysocki" Cc: Madhavan Srinivasan , Michael Ellerman , Nicholas Piggin , Christophe Leroy , Nayna Jain , Srish Srinivasan , Mimi Zohar , Yoshinori Sato , Rich Felker , John Paul Adrian Glaubitz , Juergen Gross , Stefano Stabellini , Oleksandr Tyshchenko , Nathan Chancellor , Nick Desaulniers , Viresh Kumar , Zhongqiu Han , Alexander Aring , Felix Kuehling , "=?UTF-8?q?Christian=20K=C3=B6nig?=" , Zhihao Cheng , Sumanth Korikkar , Bill Wendling , Justin Stitt , driver-core@lists.linux.dev, llvm@lists.linux.dev, linux-hardening@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-doc@vger.kernel.org, linux-acpi@vger.kernel.org, linux-pm@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-sh@vger.kernel.org, linux-s390@vger.kernel.org, gfs2@lists.linux.dev, xen-devel@lists.xenproject.org, linux-mtd@lists.infradead.org, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Ian Rogers Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-26.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_PASS, SPF_PASS,USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on aws-us-west-2-korg-listserv-alma10-1 struct dlm_ls embeds a struct kobject (ls_kobj), but dlm_ktype lacked a .release callback and dlm freed the lockspace structure directly via kfree(ls). With CONFIG_DEBUG_KOBJECT_RELEASE=y, freeing ls before the delayed kobject release runs causes a use-after-free, and unloading the module while the delayed release is pending results in an instruction page fault. Add a completion ls_kobj_done and dlm_ls_release() to complete it when the last kobject reference is dropped, waiting for it in free_lockspace() before kfree(ls) and in the new_lockspace() error path before module_put(). Also delete the kobject via kobject_del() before stopping dlm_recoverd to close the window where concurrent sysfs writes could wake the stopped recovery task. Fixes: 3514faca19a6 ("kobject: remove struct kobj_type from struct kset") Acked-by: Alexander Aring Signed-off-by: Ian Rogers --- fs/dlm/dlm_internal.h | 1 + fs/dlm/lockspace.c | 26 ++++++++++++++++++++------ 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/fs/dlm/dlm_internal.h b/fs/dlm/dlm_internal.h index 74c2e77d1b55..95b3bff0cb57 100644 --- a/fs/dlm/dlm_internal.h +++ b/fs/dlm/dlm_internal.h @@ -576,6 +576,7 @@ struct dlm_ls { int ls_create_count; /* create/release refcount */ unsigned long ls_flags; /* LSFL_ */ struct kobject ls_kobj; + struct completion ls_kobj_done; struct xarray ls_lkbxa; rwlock_t ls_lkbxa_lock; diff --git a/fs/dlm/lockspace.c b/fs/dlm/lockspace.c index a9c98b4f378f..2dccd080a10f 100644 --- a/fs/dlm/lockspace.c +++ b/fs/dlm/lockspace.c @@ -179,7 +179,15 @@ static const struct sysfs_ops dlm_attr_ops = { .store = dlm_attr_store, }; +static void dlm_ls_release(struct kobject *kobj) +{ + struct dlm_ls *ls = container_of(kobj, struct dlm_ls, ls_kobj); + + complete(&ls->ls_kobj_done); +} + static struct kobj_type dlm_ktype = { + .release = dlm_ls_release, .default_groups = dlm_groups, .sysfs_ops = &dlm_attr_ops, }; @@ -355,6 +363,8 @@ static void free_lockspace(struct work_struct *work) */ rhashtable_free_and_destroy(&ls->ls_rsbtbl, rhash_free_rsb, NULL); + kobject_put(&ls->ls_kobj); + wait_for_completion(&ls->ls_kobj_done); kfree(ls); } @@ -435,7 +445,10 @@ static int new_lockspace(const char *name, const char *cluster, ls->ls_lvblen = lvblen; atomic_set(&ls->ls_count, 0); init_waitqueue_head(&ls->ls_count_wait); + init_completion(&ls->ls_kobj_done); ls->ls_flags = 0; + ls->ls_kobj.kset = dlm_kset; + kobject_init(&ls->ls_kobj, &dlm_ktype); if (ops && dlm_config.ci_recover_callbacks) { ls->ls_ops = ops; @@ -567,9 +580,7 @@ static int new_lockspace(const char *name, const char *cluster, wait_event(ls->ls_recover_lock_wait, test_bit(LSFL_RECOVER_LOCK, &ls->ls_flags)); - ls->ls_kobj.kset = dlm_kset; - error = kobject_init_and_add(&ls->ls_kobj, &dlm_ktype, NULL, - "%s", ls->ls_name); + error = kobject_add(&ls->ls_kobj, NULL, "%s", ls->ls_name); if (error) goto out_recoverd; kobject_uevent(&ls->ls_kobj, KOBJ_ADD); @@ -582,7 +593,7 @@ static int new_lockspace(const char *name, const char *cluster, error = do_uevent(ls, 1, 0); if (error < 0) - goto out_recoverd; + goto out_kobj; /* wait until recovery is successful or failed */ wait_for_completion(&ls->ls_recovery_done); @@ -600,6 +611,8 @@ static int new_lockspace(const char *name, const char *cluster, do_uevent(ls, 0, 0); dlm_clear_members(ls); kfree(ls->ls_node_array); + out_kobj: + kobject_del(&ls->ls_kobj); out_recoverd: dlm_recoverd_stop(ls); out_callback: @@ -615,6 +628,7 @@ static int new_lockspace(const char *name, const char *cluster, rhashtable_destroy(&ls->ls_rsbtbl); out_lsfree: kobject_put(&ls->ls_kobj); + wait_for_completion(&ls->ls_kobj_done); kfree(ls); out: module_put(THIS_MODULE); @@ -740,6 +754,8 @@ static int release_lockspace(struct dlm_ls *ls, unsigned int release_option) dlm_user_daemon_available()) do_uevent(ls, 0, (release_option == DLM_RELEASE_RECOVER)); + kobject_del(&ls->ls_kobj); + dlm_recoverd_stop(ls); /* clear the LSFL_RUNNING flag to fast up @@ -759,8 +775,6 @@ static int release_lockspace(struct dlm_ls *ls, unsigned int release_option) dlm_delete_debug_file(ls); - kobject_put(&ls->ls_kobj); - xa_destroy(&ls->ls_recover_xa); kfree(ls->ls_recover_buf); -- 2.56.0.455.g6c5a503b38-goog