From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.82.199 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794177595; b=BexaOrqmq0KNaphfJ59tLu3yXzq8awPQZ21/+UX0DwVA7Qts5Ir8iX8UWXniJhIj4YvH A/OVd6wUX9ji60x+i39l6JtylDqLlIfkTOCJm6HdzccR9h+cd/NYThwLJdfcPkyH2HWaJ NbHrp3UtQLBTyLGqhT6anW+SDa5FY9e64PeVOsw8VALazNXP1m24Nqyj+vYKDyTvolHCX vIh6yfWq7KnnZa17MnKg3qOChQ5/PmSsWYXAensfOjo/tSmrM1P9EPey0meqWlaw/DuFF JZl7l5EaKwtQzHJ2iPPjr85bM1tgv8cC2EBl+pIhfYfing/f72wcdhVpxsYQ+09bXaA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794177595; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Received:Date:In-Reply-To: Mime-Version:References:X-Mailer:Message-ID:Subject:From:To:Cc: Content-Type; bh=Vy7610mZpT38CbXCq7RNEhhWWcPldBtQplNazUNUwLE=; b=Q4yeJr3qkT289EgITKIPVYTSkgIXGDdjbJyTsY0Cl2KzD7Ucwae52ZnEx1mr3PdBBNCn nMWQtGOk6kEgjpL0Ep/kfqdzjqBUFW8EtkZgU4l1DmoVnoOV+1SwYsMlj71hX/HcYuUV8 NCLT5XQGrkKzU0SdKRgN1c0cE3x6kkiCtFhncAzlWeQhpxQxjvBdq9AF/j6+F7BMghTEx mixT32ZQbKuEwHsKZIop1PKdAvV8cYD3t1hKOTJqKgWW+DiCzwYciAk3h4EqNkZfBlhPI ZOHSmCg/bqSmLb01GLkxwzZwWESXXJhsxZqQqtpIYHuzKt1mPkVSTZIRJKnn5dTD73w== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20260707 header.b=kQO+69v9; arc=none smtp.remote-ip=74.125.82.199 Received: from mail-dy1-f199.google.com (mail-dy1-f199.google.com [74.125.82.199]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 80B27606EE9D for ; Sun, 8 Nov 2026 22:39:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 80B27606EE9D 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.a=rsa-sha256 header.s=20260707 header.b=kQO+69v9 Received: by mail-dy1-f199.google.com with SMTP id 5a478bee46e88-36efb506f29so200274eec.1 for ; Sun, 08 Nov 2026 14:39:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20260707; t=1794177595; x=1794782395; darn=vger.kernel.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=Vy7610mZpT38CbXCq7RNEhhWWcPldBtQplNazUNUwLE=; b=kQO+69v9cjNiQn3adE++1NC4MdSxNQ+mJce7mQncXEvEXvhY+MdKRMoZbdhq8FH/O0 h3BbezYI6ZTaUJS6YImya3e9ccgWHDLHlLGV48d4aGvfsW4X/j149mh7/N61D6fvRPWO H5iapVpytk5MCfpkqd+ncnG7dF6vi0zUO+wtASuUIaEbyn6qWRXk+VviUF08JH3zQod8 806GcKs4xZrtrJzYqMZZqknwjPDTtlGvMEHLf6Gn/0L1E5uk9VABOWZWTKj2BMLU0xHS zFGFVWHyIHHUR59ylVJu1HQY8xEsqH5fPJ2cfScDPlSejw3QtdYRKBrQa7vs0+eXJvZt 3iMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794177595; x=1794782395; 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=Vy7610mZpT38CbXCq7RNEhhWWcPldBtQplNazUNUwLE=; b=WAQ9Nte/8AdNNwAON4j+7jcRODPOrCdZLwAAlaw66OhkV+7bfDx6+RY8zzN9DiUqi4 SoNpKV+DQVuCFEfu6MuCFuBlFVTTsRTczpUgVLTuP+KPHVpsfdD+KGmphCsibk3mpk3T wEetuMsBZe7d0i27A8rO2f6p5jG22hGfD1k+0IGT4sfapQaGxa/mIj7HeoB5g/fdKqnS g7L0PU5DDvDsiNuKkhKZVyKpTy8P0YF17C4Y6rqDOIO8P3+aybwRzd/kWuR+a4nQojtJ 7oGHVcrn6v7XR8K34d0mIWHAZRjw95WlQTkRvWboA1ZX/lYpCv2sj5nqnNwS+iSr9myc EETw== X-Forwarded-Encrypted: i=1; AL+hErHYqfhNH26NGOys2hNDuoFDY86vJhxHjiY6/noJaWXVSKNS0PD39K4VTB/Lpza0FI4bVEkJqM4AbeuM8b8=@vger.kernel.org X-Gm-Message-State: APuU4Z81kVM1xcLAfxSr3qj3pkVGqtF/ei8TKD0o6AE/09HlE/e8Ph8p UCzaXOcYBq2svM0E2Kt2ZPvnxEinBoAftK0Av+JPnkMZcm5v08rbrH6IIaAUG4CNPEZCR0PwDZ+ 0RXtGcPB0Aw== X-Received: from dyblf39.prod.google.com ([2002:a05:7301:a27:b0:373:6c70:7c9c]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:d584:b0:36c:9f1a:30b8 with SMTP id 5a478bee46e88-3725661520amr5331882eec.31.1794177594363; Sun, 08 Nov 2026 14:39:54 -0800 (PST) Date: Sun, 8 Nov 2026 14:39:11 -0800 In-Reply-To: <20261108223913.3624571-1-irogers@google.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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-8-irogers@google.com> Subject: [PATCH v3 7/9] ubifs: sysfs: Use kset_create_and_add() for ubifs_kset 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" ubifs_kset was a static struct kset using a custom ubifs_ktype that had no default_groups and no .release callback. With CONFIG_DEBUG_KOBJECT_RELEASE=y, unloading the ubifs module while delayed kobject release is pending causes a use-after-free on the static kset. Replace the static ubifs_kset and empty ubifs_ktype with a dynamically allocated kset via kset_create_and_add(). Fixes: 203a55f04f66 ("ubifs: Fix memory leak in ubifs_sysfs_init()") Tested-by: Zhihao Cheng Reviewed-by: Zhihao Cheng Signed-off-by: Ian Rogers --- fs/ubifs/sysfs.c | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/fs/ubifs/sysfs.c b/fs/ubifs/sysfs.c index dbf967dcf26e..e20931e3a62f 100644 --- a/fs/ubifs/sysfs.c +++ b/fs/ubifs/sysfs.c @@ -80,13 +80,7 @@ static const struct kobj_type ubifs_sb_ktype = { .release = ubifs_sb_release, }; -static const struct kobj_type ubifs_ktype = { - .sysfs_ops = &ubifs_attr_ops, -}; - -static struct kset ubifs_kset = { - .kobj = {.ktype = &ubifs_ktype}, -}; +static struct kset *ubifs_kset; int ubifs_sysfs_register(struct ubifs_info *c) { @@ -107,7 +101,7 @@ int ubifs_sysfs_register(struct ubifs_info *c) goto out_free; } - c->kobj.kset = &ubifs_kset; + c->kobj.kset = ubifs_kset; init_completion(&c->kobj_unregister); ret = kobject_init_and_add(&c->kobj, &ubifs_sb_ktype, NULL, @@ -139,18 +133,14 @@ void ubifs_sysfs_unregister(struct ubifs_info *c) int __init ubifs_sysfs_init(void) { - int ret; + ubifs_kset = kset_create_and_add("ubifs", NULL, fs_kobj); + if (!ubifs_kset) + return -ENOMEM; - kobject_set_name(&ubifs_kset.kobj, "ubifs"); - ubifs_kset.kobj.parent = fs_kobj; - ret = kset_register(&ubifs_kset); - if (ret) - kset_put(&ubifs_kset); - - return ret; + return 0; } void ubifs_sysfs_exit(void) { - kset_unregister(&ubifs_kset); + kset_unregister(ubifs_kset); } -- 2.56.0.455.g6c5a503b38-goog