From patchwork Mon Nov 11 10:13:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 13870495 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (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 F37BE1487DC for ; Mon, 11 Nov 2024 10:13:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731320011; cv=none; b=BpXHijoPBlfbRQbOtee97Iwh7OQMsxhHv6q93BEWJtWWVDh/ILEV4Vj75Iowfe+Vf3BXi3cAMEid66Il+4vFTQEp+IQfA5Auo0qgzAwN0qJKw+Ep56LNidTxTEUAHfqJFfMG4W4lElhjTXirTrGJ4sFADiyb2btyvrA0WJ2Z85k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731320011; c=relaxed/simple; bh=eeMsht0fq/5vkHuGbnWPUg1e2bsEs6ODP9xVEu1c9NU=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=oLwpraxV542GDhLfay9wFyuQg1tBLBb9tCEpOVJ1Icb5NLjNHOzta6Zj/eDBy4TuoVjpRcXxaxcWkl/X/YEYiNLCyeX2oCn3qo0qwgLmniPSIsCwpFToPyAXSiuUSyyLr2fD5+kJ3+cdsSTGPFB9rAu/j6DkeWmy1d2EoAzhhqM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=CeVrh2k8; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="CeVrh2k8" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1731320008; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=RFOv5I2JybypHq5q7M26Aqj/o+48sP+/DWqaDZsRe0o=; b=CeVrh2k8b/20utqNKnO3o8DYE+P0b6vGUnN/9zkDnzStJD4vOyvLdSz5sZPZ+31RjCDdoD ZGupHiaI7AQSBcIFfgJksT9ZibZMFFW1Pu1dlzlmYEmj77jrEkOqDQxcXCjv/0Uacd3XbS DtW3okcIYE9Q/V+P0RGZk9t2A5jK054= Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-576-IxHx3ZJvOQWFV7cAx2Qtkw-1; Mon, 11 Nov 2024 05:13:26 -0500 X-MC-Unique: IxHx3ZJvOQWFV7cAx2Qtkw-1 X-Mimecast-MFC-AGG-ID: IxHx3ZJvOQWFV7cAx2Qtkw Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id CF80619560B0; Mon, 11 Nov 2024 10:13:24 +0000 (UTC) Received: from localhost (unknown [10.72.116.22]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 90C90195E488; Mon, 11 Nov 2024 10:13:22 +0000 (UTC) From: Ming Lei To: Jens Axboe , io-uring@vger.kernel.org, Pavel Begunkov Cc: Ming Lei , Guangwu Zhang , Jeff Moyer Subject: [PATCH] io_uring/uring_cmd: fix buffer index retrieval Date: Mon, 11 Nov 2024 18:13:18 +0800 Message-ID: <20241111101318.1387557-1-ming.lei@redhat.com> Precedence: bulk X-Mailing-List: io-uring@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 Add back buffer index retrieval for IORING_URING_CMD_FIXED. Reported-by: Guangwu Zhang Cc: Jeff Moyer Fixes: b54a14041ee6 ("io_uring/rsrc: add io_rsrc_node_lookup() helper") Signed-off-by: Ming Lei Reviewed-by: Kanchan Joshi Reviewed-by: Anuj Gupta Tested-by: Guangwu Zhang --- io_uring/uring_cmd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/io_uring/uring_cmd.c b/io_uring/uring_cmd.c index e7723759cb23..1abb5c9f803f 100644 --- a/io_uring/uring_cmd.c +++ b/io_uring/uring_cmd.c @@ -220,8 +220,9 @@ int io_uring_cmd_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) if (ioucmd->flags & IORING_URING_CMD_FIXED) { struct io_ring_ctx *ctx = req->ctx; struct io_rsrc_node *node; + u16 index = READ_ONCE(sqe->buf_index); - node = io_rsrc_node_lookup(&ctx->buf_table, req->buf_index); + node = io_rsrc_node_lookup(&ctx->buf_table, index); if (unlikely(!node)) return -EFAULT; /*