From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.82.70 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793140771; b=2375zSWcmNpqPlAz046ydvxS8e02q52GyiaU6LlmhTqH7AAgJi+1ahIJvNawkz9o1a8Q HVHpqQbIpIUHcB9FiXMGN9BFAHYSjRlpDWLs2mA1OgF+s3CGiAcqyQ+Owj8puY1dPXm2e KvTft2kdei40ouGw/q4Ophw2WzUN8vda95ecpaLLqzF2Xzy7fBC6inJbnBHdfnbegUvSm N0FQYnrhkzw7bPC4cyKXy2RkmUkH+4I1JIfoMyU6DnoF4gV/KUMxHJLFwL6DgoIRXpkPp 9ZiSQegJ7utkBy33cErYDtCdbSkZGyAGdKDfiC3A+BYHTZ2jPwNDKzKN87uTflYu+/Q== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793140771; 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=aItLXVgOXAbsJZn2OZIWl+3TQwb1N1Woum6UsPYCRPI=; b=UYm/RqpEfzh1lHdvgVbspCNSOrhvzHsyT/yMQyVL0s2yRRws5nFmRWJ60/ysB18brVzd q3q9lr2qFlpZTqYywsh0A3HVmUJPlqPuFwShzCCIoCi6nHdzr+ppRTaKZJI86TL/j5HYq Jd1Ihqx39+Ln18Ml0H4KPg2MoFKLYnMspeljLLH4wEnXJ6dnpyHzQ4m1pYLt3xRalaHNr mQV5tn6pm9kKtLoHd+3BNKTBfZvr4uvU7yGQhoLV0tIxgiyr8ArRf7smqdGBQEE7PUnNZ uE+qvGhwwCdaSvsnb5xsxdiNl54ZCrt9JOClSRpi8KLdI83W1MLAP2UHenNTm2HVa1A== 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=cqwNTjHA; arc=none smtp.remote-ip=74.125.82.70 Received: from mail-dl1-f70.google.com (mail-dl1-f70.google.com [74.125.82.70]) (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 9C98960A5BC5 for ; Tue, 27 Oct 2026 22:39:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 9C98960A5BC5 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, unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20260707 header.b=cqwNTjHA Received: by mail-dl1-f70.google.com with SMTP id a92af1059eb24-1a71dd190b0so299086c88.1 for ; Tue, 27 Oct 2026 15:39:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20260707; t=1793140770; x=1793745570; 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=aItLXVgOXAbsJZn2OZIWl+3TQwb1N1Woum6UsPYCRPI=; b=cqwNTjHAYXOy8Mi0KDVWON2iofqVJPaU9RstSleLyvA0ZnHHca9sgwMffgWuSP96Vq Kpgku/LZAhDRayOYk8QgB1Cz1AwlyVsDfvTjhOxiQE6MZPH70GmVtxnVpgC0CLWmUxK9 IxTAqbdqAGbhhlKKZua67l8+9/SRZpDmPOIu25o5ZfY4arDHKBM3F+ILVqikbjfrGpZm 5TcNRqJAXT0C8XFBzOxtasn4OfHvhdu19U4W5KHMuHF1ZKBxJJPSpLvE2u+ciYeZvDCh oo6FbSB5vK82QmvlGaMLVdVgDui47ubesXtV2QdmfdzgUkdxRwV6GI4rakX9wYnSs1Mf 1abQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793140770; x=1793745570; 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=aItLXVgOXAbsJZn2OZIWl+3TQwb1N1Woum6UsPYCRPI=; b=2ERYGhXHA9OdL/pU+izltSSJnhpVkQA/pWUkCbwiJnFlJFdDS+kM3mDRLxdkIqCYrf xvfJWPBbWglQ7yCEpTI8O152E2W/HvBIJ5hyWJ0rKR+C3u12ZV6Y1Oe7ANqqvZJ/9Fq/ BVmIXOIZMsSoR3cedzTb36cgoWdz+Denw5uw99jOnF+TOUDVJJD/PTtik+DhI1/0WRrA 5WrmbKZIJgA6YSOJ/yiEt8MnrzzbdeybLjPw70v4BBnlBdGwc4YoGxaG9HCsoqv/KSf5 bDGmjRvIrYrc8xP6dAqZtuTtJgiwxoLihapHO39/QulY2msq/ow0ImOfcVOCWkrm6rlx HISQ== X-Forwarded-Encrypted: i=1; AKwUvByRs1fhhwu/4vn3iV3M9cuzbfgV/apvhLop14XtCdeikIUcZ2GWiOEvXV/DxAlpY/RH5elibtfXj2mmwvpc@vger.kernel.org X-Gm-Message-State: AFq9FYL7RN2qygyXiKlkpfxdT2JQGwN998ZyGHnsyRuM1LavwFkfvk23 5aan+He+h5lx0Go8DRE0sODtKCU916V0V7URsfYq/H+c4FIGGyRHObzjB5T38fwBuTgVKUJ72p9 rcXLMb1g6HA== X-Received: from dld12.prod.google.com ([2002:a05:7022:30c:b0:191:45cb:f8d3]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:607:b0:166:af48:a2ba with SMTP id a92af1059eb24-1a6c2c71125mr1317138c88.0.1793140769446; Tue, 27 Oct 2026 15:39:29 -0700 (PDT) Date: Tue, 27 Oct 2026 15:38:42 -0700 In-Reply-To: <20261027223847.652884-1-irogers@google.com> X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list Mime-Version: 1.0 References: <20261027223847.652884-1-irogers@google.com> X-Mailer: git-send-email 2.56.0.313.g2479322e68-goog Message-ID: <20261027223847.652884-8-irogers@google.com> Subject: [PATCH v2 7/9] ubifs: sysfs: Use kset_create_and_add() for ubifs_kset From: Ian Rogers To: Kees Cook , Greg Kroah-Hartman , Miguel Ojeda , "Rafael J . Wysocki" , Danilo Krummrich Cc: Nathan Chancellor , Nick Desaulniers , Miguel Ojeda , "=?UTF-8?q?Christian=20K=C3=B6nig?=" , Zhihao Cheng , Zhongqiu Han , 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 , Richard Weinberger , Liu Shixin 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.313.g2479322e68-goog