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 CFCDF606A326 for ; Sun, 8 Nov 2026 22:40:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=e2s4pLvh; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20260707 header.b=fVDrhCyD 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=tBJ6cwYc2QB2RpSWKzkwwWFD4CbWUZbuIQ+89H4s0qA=; b=e2s4pLvhKxkXu1Ax9ipijINv8s Glm0iSH10uosvpfTdqEVgE0JkONp+BqP+R+kYxpQNpAyVb1hjV1Ao6owpjaG4ubr7miLajRvIPgr9 2DSxtOUTj0zmKBOzYssDnvrYgRMqwuCf1Z3sr8VdpFilG3WL4+rJBkzlfl6lVI4KjhUS6tkVaQXPI /dvQuHfA2PNKzLmAI1x+i8RD9R8hv9LN76HdXn3vpcgAH7sXae7VMX2kJC1VtEPQYykVpOqLn3W/S V/4CzykGnyv0MiEULj212tthLy+wT9kzo4Yg8qi/dvs8LaXDZRJ+uNjVrvTXTsccqMpKjFx99d2oK vFxPJPAg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.100.1 #2 (Red Hat Linux)) id 1xQBYQ-0000000GqGS-1Dts; Sun, 08 Nov 2026 22:40:02 +0000 Received: from mail-dy1-x1345.google.com ([2607:f8b0:4864:20::1345]) by bombadil.infradead.org with esmtps (Exim 4.100.1 #2 (Red Hat Linux)) id 1xQBYM-0000000Gq8X-0fRO for linux-mtd@lists.infradead.org; Sun, 08 Nov 2026 22:39:59 +0000 Received: by mail-dy1-x1345.google.com with SMTP id 5a478bee46e88-36cec75d8caso401717eec.0 for ; Sun, 08 Nov 2026 14:39:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20260707; t=1794177597; x=1794782397; 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=SmJ3SdTe6uZnhzgZJuKjeaRKDfWwuPiS9sl/mhr3vm4=; b=fVDrhCyDFkHtQb/JXiD0Gky0cKyXZrpXSpE58hycvHsok6T2HttifBm5Z3znBdXBaC wgtQGz6PN78tjDjdsbRZu3H+GHdOGRaU8FKbve7Y+xUPTXUrVAtj2Ny41hrXp5CHPmBz KgvTOROM5PzCsEitahUKi9dmOlgeJwIjtaehNQKB9IfID4+HNfzKguSVQNydI9QcdGPE 5GLyfc1H0TOEpoZGN3vRF9++YRhXMh0jWwqH/pKn85d5nyydnp8kHASrmskujkPjT9E/ sM7emhXNURWbg3x5NnPboonW2ple6yShVN+5h0GgB66CV7izZ9pEVqmWD9NQ+rv9WMnf GBJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794177597; x=1794782397; 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=SmJ3SdTe6uZnhzgZJuKjeaRKDfWwuPiS9sl/mhr3vm4=; b=sj95wAE8i+dzbv1nZWyA7jjPz4yAESPViI//Zx6HJmezysjn+rCvp8eSZbL8cKzuwX 2t06fbWmYjKLydNlYNYfzVu5Ffr1Fn8GAr/Cfwei6dY8cAqNIXLyFY1Iv5PES9aWmMwV MbeuddssN0lWcbxREdjHODsJySpHN43VZ9ZkzFPuP6R3pen4pTjXTAuLCGoxvpRbWxXt cQJ1XlHmSpg8KUwcwzQWF29tCiKUYjmbxigk42YiLVzwvQT0ICSp/hLeREdbho3Pmi24 xoql5t4JZDSW7247TM04CgKSoXYmTFe1+AD1j7+AEfq5GjB4lXuXmpmEpf5KjFquuV4e zXOg== X-Forwarded-Encrypted: i=1; AL+hErEn+/nWKgzCiOUuqhaiX4RSXVjIgriZ8mW0AFXmdiNOxlra4ufOlaR8mjMcDAY1AMT7lShvwzgrx1A=@lists.infradead.org X-Gm-Message-State: APuU4Z8LjXb8IiGUDk8Udu3h7yiiQkIb7Ds0UESK213IQVpukiC+R4VO lLVXlrFNBI4c3ehcJFl2v9DpabRFmXHmEbFGM7mUJyqBWd27GlNyVk5BTG3QVcAV2oXkjuiVTER 37fRKZVeu9A== X-Received: from dyz23.prod.google.com ([2002:a05:693c:4097:b0:369:7ef0:57b0]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7301:9a90:b0:36d:38e0:79f3 with SMTP id 5a478bee46e88-370f8170ddamr8689075eec.25.1794177596308; Sun, 08 Nov 2026 14:39:56 -0800 (PST) Date: Sun, 8 Nov 2026 14:39:12 -0800 In-Reply-To: <20261108223913.3624571-1-irogers@google.com> 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-9-irogers@google.com> Subject: [PATCH v3 8/9] drm/amdkfd: Free queue in procfs_queue_type 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20261108_143958_255710_2F026BD3 X-CRM114-Status: GOOD ( 13.69 ) 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=-16.9 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 struct queue embeds a struct kobject (q->kobj) for procfs entries, but procfs_queue_type had no .release callback and uninit_queue() freed q immediately after kfd_procfs_del_queue() called kobject_put(&q->kobj). With CONFIG_DEBUG_KOBJECT_RELEASE=y, this causes a use-after-free. Add kfd_procfs_queue_release() to free struct queue from the kobject release callback, change kfd_procfs_del_queue() to only remove the kobject from sysfs via kobject_del(), and drop the final reference in uninit_queue() via kobject_put(). Check q->kobj.state_in_sysfs before calling kobject_del() in kfd_procfs_del_queue() to avoid warnings if sysfs creation previously failed. Fixes: 6d220a7e7971 ("drm/amdkfd: Add queue information to sysfs") Reviewed-by: Felix Kuehling Signed-off-by: Ian Rogers --- drivers/gpu/drm/amd/amdkfd/kfd_process.c | 12 +++++++++--- drivers/gpu/drm/amd/amdkfd/kfd_queue.c | 5 ++++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process.c b/drivers/gpu/drm/amd/amdkfd/kfd_process.c index 6663718fb83c..b349e0d8d47b 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_process.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_process.c @@ -512,7 +512,15 @@ static const struct sysfs_ops procfs_queue_ops = { .show = kfd_procfs_queue_show, }; +static void kfd_procfs_queue_release(struct kobject *kobj) +{ + struct queue *q = container_of(kobj, struct queue, kobj); + + kfree(q); +} + static const struct kobj_type procfs_queue_type = { + .release = kfd_procfs_queue_release, .sysfs_ops = &procfs_queue_ops, .default_groups = procfs_queue_groups, }; @@ -552,7 +560,6 @@ int kfd_procfs_add_queue(struct queue *q) if (ret < 0) { pr_warn("Creating proc//queues/%u failed", q->properties.queue_id); - kobject_put(&q->kobj); return ret; } @@ -697,11 +704,10 @@ static void kfd_procfs_add_sysfs_files(struct kfd_process *p) void kfd_procfs_del_queue(struct queue *q) { - if (!q || !q->process->kobj) + if (!q || !q->process || !q->process->kobj || !q->kobj.state_in_sysfs) return; kobject_del(&q->kobj); - kobject_put(&q->kobj); } int kfd_process_create_wq(void) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_queue.c b/drivers/gpu/drm/amd/amdkfd/kfd_queue.c index 6010a5d7a7eb..f7413d651620 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_queue.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_queue.c @@ -83,7 +83,10 @@ int init_queue(struct queue **q, const struct queue_properties *properties) void uninit_queue(struct queue *q) { - kfree(q); + if (q && q->kobj.state_initialized) + kobject_put(&q->kobj); + else + kfree(q); } #if IS_ENABLED(CONFIG_HSA_AMD_SVM) -- 2.56.0.455.g6c5a503b38-goog ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/