From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2FAFB3BE64B; Wed, 20 May 2026 17:57:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779299877; cv=none; b=WZAE7KQRpEFmNy5a3zSFA7jl8Y0bba3U0bG+h1eRShiZOz9fs874Gh0bq3/MVaHwqKCmmzYTVGjsBrf1s76UNkQYz3utHm9kkorG/YP55WyAmgDVjZmx38eyrnFTCq+RMLNpMqy5PtRs9QmRNjknKcrz8OpyQkcgp1blMpzu1yU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779299877; c=relaxed/simple; bh=pM2M8rixY4Lw/u2BZsxVlzDQ7OZbxeYb006+m2c8XOI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nK1j/LMAyVxm3oyd6ENzSoZec+VGfXKPUZCDy7+bxRRd3KL8K4RxEEekEEEsu2+tJXwea99A7E35gTj1h5AshhXRkvcScsI7GTsS1DqhVeLxPrw6mdl36SGb0fGWHPnc7qqoM4quzqWUP6aCcqKQW7sppNnWJiLqRJyVgSsp05E= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=bAHTUG6E; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="bAHTUG6E" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9596B1F000E9; Wed, 20 May 2026 17:57:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1779299876; bh=wu3Zg8v7eEm+D9Obw7pWwBwR7GblVBzIm0Se0Acnx68=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=bAHTUG6E9+Idi0njzNfV+5z6MSW4AajmiLx/niklOlMXCSuUhi/zZEnAyj1uL1TqU 0vskOkBUfsYfVKBwZtrZHkb/JE/kXiKTIhWgo98GkX+5pKW0E1WYe+ZmmPea421Pw9 7pGuQHmQZx1LQ569MOj+E8iup98TVuOujq0a1zW4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Nicholas Carlini , Jens Axboe Subject: [PATCH 6.18 919/957] io-wq: check that the predecessor is hashed in io_wq_remove_pending() Date: Wed, 20 May 2026 18:23:22 +0200 Message-ID: <20260520162154.510886258@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260520162134.554764788@linuxfoundation.org> References: <20260520162134.554764788@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Nicholas Carlini commit d6a2d7b04b5a093021a7a0e2e69e9d5237dfa8cc upstream. io_wq_remove_pending() needs to fix up wq->hash_tail[] if the cancelled work was the tail of its hash bucket. When doing this, it checks whether the preceding entry in acct->work_list has the same hash value, but never checks that the predecessor is hashed at all. io_get_work_hash() is simply atomic_read(&work->flags) >> IO_WQ_HASH_SHIFT, and the hash bits are never set for non-hashed work, so it returns 0. Thus, when a hashed bucket-0 work is cancelled while a non-hashed work is its list predecessor, the check spuriously passes and a pointer to the non-hashed io_kiocb is stored in wq->hash_tail[0]. Because non-hashed work is dequeued via the fast path in io_get_next_work(), which never touches hash_tail[], the stale pointer is never cleared. Therefore, after the non-hashed io_kiocb completes and is freed back to req_cachep, wq->hash_tail[0] is a dangling pointer. The io_wq is per-task (tctx->io_wq) and survives ring open/close, so the dangling pointer persists for the lifetime of the task; the next hashed bucket-0 enqueue dereferences it in io_wq_insert_work() and wq_list_add_after() writes through freed memory. Add the missing io_wq_is_hashed() check so a non-hashed predecessor never inherits a hash_tail[] slot. Cc: stable@vger.kernel.org Fixes: 204361a77f40 ("io-wq: fix hang after cancelling pending hashed work") Signed-off-by: Nicholas Carlini Signed-off-by: Jens Axboe Signed-off-by: Greg Kroah-Hartman --- io_uring/io-wq.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/io_uring/io-wq.c +++ b/io_uring/io-wq.c @@ -1125,7 +1125,8 @@ static inline void io_wq_remove_pending( if (io_wq_is_hashed(work) && work == wq->hash_tail[hash]) { if (prev) prev_work = container_of(prev, struct io_wq_work, list); - if (prev_work && io_get_work_hash(prev_work) == hash) + if (prev_work && io_wq_is_hashed(prev_work) && + io_get_work_hash(prev_work) == hash) wq->hash_tail[hash] = prev_work; else wq->hash_tail[hash] = NULL;