From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ot1-f42.google.com (mail-ot1-f42.google.com [209.85.210.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DEB0640DFB7 for ; Wed, 13 May 2026 14:20:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.42 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778682022; cv=none; b=f8ayEJAgBUTrvTwZnr0tiprBmSN6D8mjZQvMvVKePnxD2QpO/hC8o8NlZ0Ugfj/eyxenyghFXR5lYcP849pdrD6c1YsHTilEapASrpzIUHPV6mnUnaMwD8sxwK7eWVzpPUHWxDorJf6YMfco1QuocVzeb+oumZn8jOdHNTL6BtQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778682022; c=relaxed/simple; bh=UCpYTl+hK0wyJuM9uv5iFLNTb97qvTTBn0xdj4QW7+4=; h=Message-ID:Date:MIME-Version:Subject:From:To:Cc:References: In-Reply-To:Content-Type; b=IsMEazh1Ld5jF1Z2/m8wJ2qORmniiSXTF5T3fLwTFoJs1nnFm0iYArVoWsCc+hF+i8rfbkMjR12gKRRq4hSn5q5cdkM8RBMhxJ1DWAtsOSHcCWGZf0htkVbLlT2Up73foj5Or7dLDqg5XjVwBSDxYIZtPWql9FA89EUMCJ0Ye2Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk; spf=pass smtp.mailfrom=kernel.dk; dkim=pass (2048-bit key) header.d=kernel-dk.20251104.gappssmtp.com header.i=@kernel-dk.20251104.gappssmtp.com header.b=eVGBnbRf; arc=none smtp.client-ip=209.85.210.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kernel.dk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel-dk.20251104.gappssmtp.com header.i=@kernel-dk.20251104.gappssmtp.com header.b="eVGBnbRf" Received: by mail-ot1-f42.google.com with SMTP id 46e09a7af769-7e363c6141dso4850078a34.2 for ; Wed, 13 May 2026 07:20:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20251104.gappssmtp.com; s=20251104; t=1778682016; x=1779286816; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:from:subject:user-agent:mime-version:date:message-id:from:to :cc:subject:date:message-id:reply-to; bh=hp7S6Qr9jx44kYcFnSHSzYhDtCJc9snTWpODvsgk43w=; b=eVGBnbRfOqAzJEnhvQm8/CRVd6IFGfOWKKX08cBnlltfTGTDFzKIcmzBNa1HpOHo0e weC27ETBiOAiAZ2RckdSgSAPlkxzEZZ9is61GwZKpKKm6pyQdVEInaOiRFMc9Jhil8O4 IDyIji2lweAGBOoDwXyAU/ojUoMpqCHhyz/PKp1iIF6bwn0e23t3Ufm5GTbArH8Pcj7c G/+JWKMoQ42S9rogclY3kYOW6meKVwTECo1h68mBEY+WgaV6+EbmmggJ8cM2ZoglUvD7 RGP97FLPbUJwsmO4/ZbCvMqLvBIdKZKpqOgiP5adP/BZdiK6hHOGgdv2Ycn4XDowPAJP EvZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778682016; x=1779286816; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:from:subject:user-agent:mime-version:date:message-id:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=hp7S6Qr9jx44kYcFnSHSzYhDtCJc9snTWpODvsgk43w=; b=ZhLkHXWH/1neQh2GE1aQyMJDMkd0bmffFhupFi6f8fS07bI3ZqH0Ea+jY+dNjTk+ZC idt3D+tnRwOQUotTML6Qzqicma6moum/pq6dMj7+YZXdWGCBxhZn+eSdkeXZ/jLlTMUm E1FwcpNezaqw2QobgyBOQ5kpvpi1yMbl+SF2Ct8qtaHvws/Rgvs9lMBxPd1OKPI3hMK6 9RDNl6WlmY//PRDtxUF0UfbconQJezC/uGrmnQb+b8jU2zcy2utyT3fglnwK1gPwW9Jv gz7pQoMMmMH/v58CNYDZe7maIay+L4Oj8U6GiuZwBXRkc5J6b7kJZa7lrmFLKPwRwQ6U T8RA== X-Gm-Message-State: AOJu0YwsmoTL46fBSqqAmBQp0/0GdryTfFEqCEGq8szoEneoS0leX/SI Rg7jemYuTYWNLYePE6KMTq3NhPwD5KLlJUiGUYE0TCOPo+2PcEu4Wz2Vj4IOL/nPW7g= X-Gm-Gg: Acq92OHDLIsoTRdfRhmMEiaz/NH4XWNxo2X55kcbMT0L7EHkdQI7LfR+NDmuYf0lJI0 qIOOZRyMZCDVlXb2gg4mLzkcaGYQsuCZOokvnmhH4Fx7OY6FAJYqNfcYWmLo6yeWjCGCD7K6yFd fcNeH55CKxc5chq261MdQugGFRb8RWlaU3QEzAGhme7ZEUcjHet4IirgDwTN4nBj5Sg/t602Eia mkefP1b07FP3/8ywoQIoV8v0UX8CefRnF0eqUQoEryjmJOdbT5TyCGO/ZcdydO3IpHaKKfCW4H5 qXXkFORRYX/raVRwk349k7D233eS9OT7/tLqRuEi8zrdYpn+IzuaPvmiSjHiBtrNnRMlFSitzpo mOcNf88ZSAWqOg3eFgJopnX3MB6Yfao0pnvYeVrtqLFW+e2QxxLWLbC0cB/34PEePiYkImDIlJf LfPCRjqxdm182i3yrrVIHJk1Nb1HuxtYhl90F/P3oQWOP8bW6g5TGAkV75XVYySoBXsYCbyrLxg 1pcDr/rUQ== X-Received: by 2002:a05:6830:d17:b0:7d7:fbe5:e9b3 with SMTP id 46e09a7af769-7e3d9ff2e9fmr2295058a34.3.1778682016210; Wed, 13 May 2026 07:20:16 -0700 (PDT) Received: from [192.168.1.150] ([198.8.77.157]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7e367d4fdf4sm10768157a34.14.2026.05.13.07.20.15 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 13 May 2026 07:20:15 -0700 (PDT) Message-ID: <36e2e080-0fe0-4108-8a27-3be8b10ef97b@kernel.dk> Date: Wed, 13 May 2026 08:20:14 -0600 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] io_uring: validate user-controlled cq.head in io_cqe_cache_refill() From: Jens Axboe To: Zizhi Wo , asml.silence@gmail.com, io-uring@vger.kernel.org Cc: linux-kernel@vger.kernel.org, yangerkun@huawei.com, chengzhihao1@huawei.com References: <20260513063254.1122354-1-wozizhi@huaweicloud.com> Content-Language: en-US In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 5/13/26 8:18 AM, Jens Axboe wrote: > On 5/13/26 12:32 AM, Zizhi Wo wrote: >> diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c >> index 4ed998d60c09..92e255e9e08f 100644 >> --- a/io_uring/io_uring.c >> +++ b/io_uring/io_uring.c >> @@ -710,11 +710,13 @@ static bool io_fill_nop_cqe(struct io_ring_ctx *ctx, unsigned int off) >> * fill the cq entry >> */ >> bool io_cqe_cache_refill(struct io_ring_ctx *ctx, bool overflow, bool cqe32) >> { >> struct io_rings *rings = ctx->rings; >> - unsigned int off = ctx->cached_cq_tail & (ctx->cq_entries - 1); >> + unsigned int head = READ_ONCE(ctx->rings->cq.head); >> + unsigned int tail = ctx->cached_cq_tail; >> + unsigned int off = tail & (ctx->cq_entries - 1); >> unsigned int free, queued, len; > > This looks wrong, as you're snapshotting 'tail' while it could get > modified by if a nop fill before the refill happens. And fwiw, looks > like the refill part potentially suffers from the same unsigned issue. To be clearer, I think you want to add a helper ala: static unsigned int io_cqring_queued(struct io_ring_ctx *ctx) { struct io_rings *rings = io_get_rings(ctx); int diff; diff = (int)( ctx->cached_cq_tail - READ_ONCE(rings->cq.head)); if (diff >= 0) return min((unsigned int) diff, ctx->cq_entries); return 0; } or something like that, and then use it in both spots. Would make for a cleaner fix, too. -- Jens Axboe