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=1795116373; b=wKtWYrs3uiHECExH6Zfb9rD/6oKCUxMwNesPAjvcQqS8QPA7NlHAPudxaXL1BZv5Nt+3 tqDj6M1E5FhDcKL357lHCppnz+b+RfpeJhQmmHvCcQfoVrrR8PN+rbFecb6cpDdcpXQ9b Mz0P8Fj4seQsV8QIx4TPyywryq/BUHhdI1B2pHmxlSdWjSlBX7Qn4PERBoe03sDrO0V/N SZlVJyoOISqaNz19DEhklqXwE7Tdf/jcYHPFU2QeVlZ5faV6ilajE5gVuJyuKZRRsZaF7 Wbxu2t1PxCTCsrmDGBnhVwTaJb5j+m/SyHiWBJJrx8FU4hskrl6eYIdGKRY2RWW9lww== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795116373; 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=ed6ZuPWwDHIYUoQ+FZI+Wi1n/4SIGbM4V5gI4MqacGo=; b=a4E7rbCVd9TB27DPCO5P6HPpmEBP/gR8FByoAMYIPd7vO+DNZhzPC329+aOW2Znrmq9H 57dVzi75IRECFoERAzpn0OfSdI7B6/0AYzAD/Ttu5kWYK1V2TvHMScil4nHbNsmGoVWoj QM9CzK1VpORBjwM/AiRP2R84CWDS6r/Ogb0tRhC0hRpMFiDjMv8LCGyiVOWzxJ4CEPyap NLkRKO+d3V68hf4ne8m7YW3TI0awfK9CIAXppDobInYdOw6yRbNuppTM6HCy54ztjpPG9 p4naeKrqSUxozP3Ps9BGy7kmj9gy8Vn5Doec9QJ+I2Fc0rfDKKPR/YELTGqneUwJsNQ== 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="NjO//qDr"; 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 9DB3460A2623 for ; Thu, 19 Nov 2026 19:26:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 9DB3460A2623 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=NjO//qDr Received: by mail-dy1-f199.google.com with SMTP id 5a478bee46e88-383f2d05c73so196840eec.0 for ; Thu, 19 Nov 2026 11:26:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20260707; t=1795116372; x=1795721172; 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=ed6ZuPWwDHIYUoQ+FZI+Wi1n/4SIGbM4V5gI4MqacGo=; b=NjO//qDrdYbGqYCOGofMX5yfxIWxPPEXNQAwQ6vQ0ceN1aX5l1m0CCqBv8De+Vhn5D 4lrDkOfv3Uelh3Gd4nKuRFhhf5GkRvlammnMuBtKCB29+ekXmosUpAM0YvM/aPCtQuVm XafI4vFUHtAX7g9+up+sUPY+TIPnNDeYBtZyEkfs5JaFlGN+mYb6T1IndEqDl/xSqyrk Uh41dyOr5vyGgoGcqRpXAoNKJH2qQG1xmw/qM6NOIcRElZzO2zr0/5vuQh/nlDvJKBkk ybp+8B+zW2yL7aG7wNNHjaibIpSoRn9D3t9CtIJvEp2b+xg+V4ijDTmW+i+M9pijI+xK UvKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1795116372; x=1795721172; 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=ed6ZuPWwDHIYUoQ+FZI+Wi1n/4SIGbM4V5gI4MqacGo=; b=nYqBBHqRJp3ZomMCaOTf1+lAG1uvGcWbvHlSmILoh29SbT3VStq4NldK0Vz9PVvvpT KBAvi3PC0SSr0ILcEwxJIYcDAGe6qSKVGe+QAAGyYTmTlvexqdgtHhZ3QWuRy1bUaaqx rhbEF+lqF3OA9ZilxQgYc84buP6JRbgh3S1Zhz2RvzWoIlDZsRg3yEweb4zmgq3C42Pw dBEnOgg7HsM6AGI1XCv6zHsMsF96fbzGrHmjmx1H+wvTcRW+KhVvJ/+oGyqofACUkyu5 ak7A+JTALQu7iFAAh5iqjOumKxdt35hEk0EBSpdIgSmndXr6dp6m2SkdY7g1x2Ok2or9 OS+A== X-Forwarded-Encrypted: i=1; AL+hErELI3o5v3SoZ/i/ab+hRR3DtKhz7wdfPCCiya7ytpbitN7xCXm9Dr915yiFjWEiukf5Y9+MfGJaqg==@vger.kernel.org X-Gm-Message-State: APuU4Z9u859L19/dEfpjGNRHwBdLa5WfuibB4xI+9YyOkZeo1zl2szXi vSW8Awq/FxZTzTqup5r30qvRi5C+OV224NGsx4NIsmfe/c5nEGRjARxs4D5Ry5c1j/YhAT/e8Ou 43qwTawif9w== X-Received: from dyhd22.prod.google.com ([2002:a05:7300:8296:b0:381:d3ca:9f05]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:6018:b0:381:9593:9984 with SMTP id 5a478bee46e88-3857151d6abmr284926eec.37.1795116370935; Thu, 19 Nov 2026 11:26:10 -0800 (PST) Date: Thu, 19 Nov 2026 11:25:19 -0800 In-Reply-To: <20261119192520.1983406-1-irogers@google.com> X-Mailing-List: linux-sh@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list Mime-Version: 1.0 References: <20261119192520.1983406-1-irogers@google.com> X-Mailer: git-send-email 2.56.1.750.gf70dc682cf-goog Message-ID: <20261119192520.1983406-9-irogers@google.com> Subject: [PATCH v4 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 , Srish Srinivasan , Michael Ellerman , Nicholas Piggin , Christophe Leroy , Nayna Jain , 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" 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 cd41b10e0873..636cc894223d 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.1.708.g77570a6a1d-goog