From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f197.google.com (mail-dy1-f197.google.com [74.125.82.197]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 086A3563FC8 for ; Tue, 13 Oct 2026 22:40:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.197 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791931238; cv=none; b=s2rwSVgusQSDh6S1s6/tSw+uAavh5b5y0Av60kM4fA7sPN1Vhh7Yzbl5VHIWeOu7mAzfIV77anOJUpMxEwarqH8BoHGdLxkLJHyrL+zSHHlkJ8/fF1DY2I8yYhgbr7HKLw+Z+8ZEkk3gAMpy+OUS+K2J/Z6/efLkYA3TwNm6vgQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791931238; c=relaxed/simple; bh=GRIZQKuwWcuCjR8A0ylF/V4G5/ojiWDtGgUJc8zlstU=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=SXRHUgXbIcpnW4SKfxhVmHAJqRK5eBCkJSGGG36OXvCC7fjw4WQ3qt8lYe63v91JKUWJGvVSQKYgO0L3b0Z8XhWB/eX+h7CaT+pl8MaeNFTVtbBazm2ndzHMhn/65N5iO8wvQAE5Bmjslgg4nUGjlw8TXnWa8r0LxjlyGvHn1eU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=Ai1t/+eq; arc=none smtp.client-ip=74.125.82.197 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Ai1t/+eq" Received: by mail-dy1-f197.google.com with SMTP id 5a478bee46e88-30c0d568830so7230446eec.1 for ; Tue, 13 Oct 2026 15:40:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1791931227; x=1792536027; darn=lists.linux.dev; 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=zqg4bcg4yTM1CSL1NV7gzxaOXxYgsDcagY96onRKZWw=; b=Ai1t/+eqUT+KGnrtqISTY8Cq8nfVdDXxPMlzIWHxQfZaPjtGxvTeAxaQdgdqgYvevM xay74ZPR4R02YhN6tQYpu+ExL3WmxkzzX1BpUF/ucjhaz5TLalByHRwyiZXsbzLKETbG 08quJd4IUnuR2mB4+Ek8vRariv+rV7/bCTZJgWBQjVg9gLCBPXFJlFZ72cp0aeSqt+jM NxcsLBqhMRzLLZUC70pUTcjGUf2rCELIRwXXI3XngxCW1mjM1icHODhqNfYE8zxRT3Qc 6J5KGQsFaDRGUR5RGcS9eyL6cJ41oMWruCb8otmsECtrOEN8uv4Aoqnbm7VBXZ+ukh6T HRhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791931227; x=1792536027; 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=zqg4bcg4yTM1CSL1NV7gzxaOXxYgsDcagY96onRKZWw=; b=dE+FAkYKIqpDGhn3io+bZ7WEgRn92B3kFl+yypgnlQX1F2X5G7XXj2Qxg6A7z8reHZ vyT8Y6G8KpYwmoIryoLpOu7cagknXdg1yeddP59arwx4w9hDyLPotiG7g3gE9wZvGx1S +8CYZ0xVKA1PMZg3NxWV0lYG7Rg5NQJV9SfGvLv4W13OYM5rARNlfByTkl5UNmnUN6JA /mEhe/zcv5a3p6nDv4OAz3HElBMeFo7kfSoRlsdI0M3zO6PLJZ5i21Xl3iyBMEM70Pwx eGuUx40uk0qvg85hfzggZDCFez9Ym77H8JHqjeuXJ8vFsry/E/jYAA7oZKc+/Ws6fv/g hX5g== X-Forwarded-Encrypted: i=1; AKwUvBzbGZIWFT/+k27dWQvjRbu7D4cAw6GvWZIIi7EF34f9S7ZuC5sIXZurF1P0s/0GtqX8Qog9MC5vkiJBWg==@lists.linux.dev X-Gm-Message-State: AFq9FYKf8akJwJZHq1sxPg04b2bJ9qHiIMy1RkIKvEa6CJGONS4FyceX Kz2vfP7W/XT0SMpTQBnCcOQ4G17wNgVW4/XJyDtQdFHgdAPgSY4sgnE9HVBfLb5HDeddvS4+NeN GYgRqLMXDeQ== X-Received: from dldyq19-n1.prod.google.com ([2002:a05:701b:4553:10b0:164:47f8:a96a]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:701b:4286:10b0:144:c128:4c4b with SMTP id a92af1059eb24-16a5e49c474mr18578865c88.36.1791931226644; Tue, 13 Oct 2026 15:40:26 -0700 (PDT) Date: Tue, 13 Oct 2026 15:39:41 -0700 In-Reply-To: <20261013223946.1836757-1-irogers@google.com> Precedence: bulk X-Mailing-List: driver-core@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20261013223946.1836757-1-irogers@google.com> X-Mailer: git-send-email 2.56.0.385.gd3acb90ef8-goog Message-ID: <20261013223946.1836757-7-irogers@google.com> Subject: [PATCH 06/11] dlm: Free dlm_ls in kobject release callback From: Ian Rogers To: Greg Kroah-Hartman , "Rafael J . Wysocki" , Danilo Krummrich , Miguel Ojeda , Kees Cook , Nathan Chancellor Cc: Nick Desaulniers , Bill Wendling , Justin Stitt , Jonathan Corbet , Madhavan Srinivasan , Michael Ellerman , Nicholas Piggin , Christophe Leroy , Nayna Jain , Yoshinori Sato , Rich Felker , John Paul Adrian Glaubitz , Viresh Kumar , David Teigland , Alexander Aring , Juergen Gross , Stefano Stabellini , Oleksandr Tyshchenko , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Richard Weinberger , Zhihao Cheng , Felix Kuehling , Alex Deucher , "=?UTF-8?q?Christian=20K=C3=B6nig?=" , driver-core@lists.linux.dev, llvm@lists.linux.dev, linux-hardening@vger.kernel.org, linux-doc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-sh@vger.kernel.org, linux-pm@vger.kernel.org, linux-acpi@vger.kernel.org, gfs2@lists.linux.dev, xen-devel@lists.xenproject.org, linux-s390@vger.kernel.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" 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 kobject release runs causes a use-after-free. Add dlm_ls_release() to free struct dlm_ls when the last reference to ls_kobj is dropped, use kobject_del() in release_lockspace(), and drop the final kobject reference in free_lockspace(). Fixes: 3514faca19a6 ("kobject: remove struct kobj_type from struct kset") Assisted-by: Antigravity:gemini-3.1-pro Signed-off-by: Ian Rogers --- fs/dlm/lockspace.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/fs/dlm/lockspace.c b/fs/dlm/lockspace.c index a9c98b4f378f..1d226b27d8e6 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); + + kfree(ls); +} + static struct kobj_type dlm_ktype = { + .release = dlm_ls_release, .default_groups = dlm_groups, .sysfs_ops = &dlm_attr_ops, }; @@ -355,7 +363,7 @@ static void free_lockspace(struct work_struct *work) */ rhashtable_free_and_destroy(&ls->ls_rsbtbl, rhash_free_rsb, NULL); - kfree(ls); + kobject_put(&ls->ls_kobj); } static int new_lockspace(const char *name, const char *cluster, @@ -436,6 +444,8 @@ static int new_lockspace(const char *name, const char *cluster, atomic_set(&ls->ls_count, 0); init_waitqueue_head(&ls->ls_count_wait); 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 +577,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); @@ -615,7 +623,6 @@ static int new_lockspace(const char *name, const char *cluster, rhashtable_destroy(&ls->ls_rsbtbl); out_lsfree: kobject_put(&ls->ls_kobj); - kfree(ls); out: module_put(THIS_MODULE); return error; @@ -759,7 +766,7 @@ static int release_lockspace(struct dlm_ls *ls, unsigned int release_option) dlm_delete_debug_file(ls); - kobject_put(&ls->ls_kobj); + kobject_del(&ls->ls_kobj); xa_destroy(&ls->ls_recover_xa); kfree(ls->ls_recover_buf); -- 2.56.0.385.gd3acb90ef8-goog