From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3371360A2634 for ; Tue, 27 Oct 2026 22:39:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=VXJMQf51; dkim=fail reason="signature verification failed" (2048-bit key, unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20260707 header.b=ZFfrq4wT DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:Message-ID: References:Mime-Version:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Unsubscribe-Post:List-Owner; bh=ozEbBX3rZP4fc8qigHBzlfuuiD9/ceX+RpGnL/GZ5LQ=; b=VXJMQf51mkIYTLXVjhd3E9El8j ertytZ+EkghAIC5+fWAi5i+MCBOmGQzRkts703/tu1E3GFV8dS7M9EFi11tePTQclFsDOBY/jOTPg t7xnUUQ0H6zzVOFuD7Tn5aP1RCeFDUt/D8ySX485AF3Nwt32cJ0AYwvy9a0TfKT3C6SROmoXzfByW jbpHQCtKvxyFWJcZ7dFP4UEbLge1pJotsQXiKbQWFYQkghEFU7kmsCAEzA5pT8Gojrs/XWmaisRsH 4PQiV/VWYu8jyn5XbsZ7Y/b/Fvp4HWd07oC5KUKUUVtS8kK+JaecTTxhI01Z/DO1a5ylT38GSLrTp IT4G29Vw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.100.1 #2 (Red Hat Linux)) id 1xLppO-00000005rDZ-3jHn; Tue, 27 Oct 2026 22:39:34 +0000 Received: from mail-dl1-x1246.google.com ([2607:f8b0:4864:20::1246]) by bombadil.infradead.org with esmtps (Exim 4.100.1 #2 (Red Hat Linux)) id 1xLppL-00000005r8a-1rTl for linux-mtd@lists.infradead.org; Tue, 27 Oct 2026 22:39:33 +0000 Received: by mail-dl1-x1246.google.com with SMTP id a92af1059eb24-1a5005fd0f8so277492c88.0 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=lists.infradead.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=ZFfrq4wThyfLQEvCEm4KVTRSCeYdQmkSIZOzTp2tJs9DS8QbaZAq5+gBYMuJJjH52p jF1BHfB5UzGYuYAWOczdcZY3DFJq/KlCo9eJb+3g1m7e00YS13zn6xVzXL3GuIU5OtnM BO/0a2AuQbyevDkxEAxkChfuJIaZ/J+WeCBHwrsFpoj84FdA9TdlDsqanNcTGEhpxW/J Ydwm1Xrl608kyxWT69oz0JwIriY9r+VWcNuLMb3JWXsBAAsp5L6jP0xyXBDILjtBfKcW pxcSm011iZ2zisyWr7DOUA06CrdQ+7L19iVlWxvtbxmy+UyyfJ6yPnyVw2kT6MejBZAo zPzw== 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=RglCqRL6XhJeYdhYat1OMQArlEMw2MOyzyZjxRNQjYH3353GpouzEhu/wPufszWjRr J3n1I0eKzczuWlHtVjp6MrdDWOdD/EEFSoVFH5anNaYFIvqAkf9y4zBnoq54RMYwxBew U+RHE8YlqaJ7ViyIWtSpc94yFiXDuZi/dZLcXEa33EmES2a3KfM5QO9b9upRGp2K7cD7 yp6hpr+gyzUXeMGyzO4y5IodRp3OsW4mtrK9K6H73bekk0C5VLlo9rDeDM2LJbv6F6Oq //DcatgY8JIqPuGCh0cShLCOtRcZo5InGrRnaXBRU4vq8U40Bz9O1tPfaigj5KSHqM0Y 2RKA== X-Forwarded-Encrypted: i=1; AKwUvBw6IFktKJhGrjIYPdR589NllzWrSBn9LxWb4NY9gBQjTEmIlNEqELNCt/IK4kAleNkKJjiXV/bDKhw=@lists.infradead.org X-Gm-Message-State: AFq9FYLk3A4jBjX2fBr1Pudsg3JIz2YH9nh7lGMIM17Gs3+O0yenHjEF +KNaqwd0Xg+E9Hq2MKGWO+faOtAmmG0zzjvgjLwjcogoW3ZEKz0HthCRgibbYlsMxQ9ZXnV81rw 8KNre1C9YvQ== 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-Archived-By: 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20261027_153931_488250_21FA58C0 X-CRM114-Status: GOOD ( 14.17 ) X-Spam-Score: -9.5 (---------) X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Linux MTD discussion mailing list List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-mtd" X-Spam-Status: No, score=-17.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 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 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/