From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 C273718801A; Tue, 30 Jul 2024 17:05:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722359139; cv=none; b=o/4hNmC2J03BVI2ZKYLrEsgTSlbNfoR2rx0X0ZFhupU8HbFZjn37TW/NFp0xqzLuWlOV7tTmLW+17jqmiODAM0FJK2LuOMHpygd4KSbwxbBwznSXqzfndVmAKgCN6pnL1IFYmjQ7HB21dJBUZMaCnCd4uIY5TdOJ3Gad/gsYOqs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722359139; c=relaxed/simple; bh=9+L4T1MQNu+F11eoTnLaBdXVeoE7/IcN+JgGyE5KefM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JjaGY+U+u0K3PL+RTr+Ry2+o0R9qdSubTgt64XCOlg78CPSQtgCDqYW2orCl6P5mPRW+sbM61dO+vWaztMWAg/a8cz1jF6b8LCs7UR7NRMtdQ5VYS91Sv1QMRwsPI9r4tfeYBHgReIFZ6FYVIr4ziJ4gSI3ADskq7LHBg7aFW4g= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=jmJgR2K+; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="jmJgR2K+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 10615C32782; Tue, 30 Jul 2024 17:05:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1722359139; bh=9+L4T1MQNu+F11eoTnLaBdXVeoE7/IcN+JgGyE5KefM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jmJgR2K+63AMUx1ZH1dda4kp3Al7gDMvCaDAn2SwMBpkD7quJx4fvqzn9u/aEZh20 SLsIqjPB2kfz+xDl2UGRjkp/neq7Am4APloTebyzJt5SuVbD3TnIQ1O8LqzmNzMBPK JwAFp8GNUglwKXpk64Tm+MozDGLp8u7k5ljqiUII= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Pavel Begunkov , Jens Axboe , Sasha Levin Subject: [PATCH 6.1 438/440] io_uring: fix io_match_task must_hold Date: Tue, 30 Jul 2024 17:51:11 +0200 Message-ID: <20240730151632.881328509@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240730151615.753688326@linuxfoundation.org> References: <20240730151615.753688326@linuxfoundation.org> User-Agent: quilt/0.67 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.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Pavel Begunkov [ Upstream commit e142e9cd8891b0c6f277ac2c2c254199a6aa56e3 ] The __must_hold annotation in io_match_task() uses a non existing parameter "req", fix it. Fixes: 6af3f48bf6156 ("io_uring: fix link traversal locking") Signed-off-by: Pavel Begunkov Link: https://lore.kernel.org/r/3e65ee7709e96507cef3d93291746f2c489f2307.1721819383.git.asml.silence@gmail.com Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- io_uring/timeout.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/io_uring/timeout.c b/io_uring/timeout.c index b0cf05ebcbcc3..7cdc234c5f53f 100644 --- a/io_uring/timeout.c +++ b/io_uring/timeout.c @@ -601,7 +601,7 @@ void io_queue_linked_timeout(struct io_kiocb *req) static bool io_match_task(struct io_kiocb *head, struct task_struct *task, bool cancel_all) - __must_hold(&req->ctx->timeout_lock) + __must_hold(&head->ctx->timeout_lock) { struct io_kiocb *req; -- 2.43.0