From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793831912; b=Q73UJ1wHu2MvhOv2KRlFtEqvtKT+YMJvLzqBorRrCmQuugtnAdrieHMjk2kd2qfE2EXT SVC+kjI4823KsBucEPxGqt6T/q+gbr+mhx01t7L37TAX4iGklwd9gbeVgceZEh98VHTmu 7yV/jx0bsCSV2PeXjOP6cmXyJi1mQnz7A1x8+qWjLmxhyBTl1KxeivhtyE2pGSRQ80etE swx6hXIloZKrEdX3MsMko87ZhYBrDdZTgNJzSTgWBjfi7l4h0TGAWRHa+JzVYivszutUi q+dQHz/Rvz2zJmtku8fmBe7ILI39MTQRT1Wduja80rHh0rXbTSyMrShch479Z4E5dFA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793831912; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=KRhXkvBhr5CZH74jC1eas2TmrN+E7zKG3TAtBCFslTU=; b=22HcuZrj54Qz8PzC62mMzIU2o0J+oELlSQ9I7Edru4LqONs0JcPnQDhkX0gxmsbC/p2y hjwHVB4AHUyPn6W19jjhdDOUpHuGKmXmBxN+yBj+MEroAPMzOW9Hs0AUpbuIVfw1tVaoF lKLpjt3mHhBTyMPK7qRAb/Nv2T2KGgPlzpNZzfOZ/rlazOOxILDqkJBgSwmWI8KyRfXOv Z4XSW/PZh/x9RUWQTj9u3b9IifhFcokGSMJOwSDsrr/9ssbAMpZ+aCI9L39oUI23a3rfS zlMkRfKe20x0nKwBtAii8M2f7UThn63sCFZv3gW1wLuOinLJaEPVtvDkCofb26DdoAA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=lscKnIvM; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2452A606A32D; Wed, 4 Nov 2026 22:38:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key, unprotected) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=lscKnIvM Received: by smtp.kernel.org (Postfix) with ESMTPSA id B69E41F000C1; Wed, 4 Nov 2026 22:38:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1793831912; bh=KRhXkvBhr5CZH74jC1eas2TmrN+E7zKG3TAtBCFslTU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=lscKnIvM9hfoduqS3G4sTf3dKvmCk1jWRPA52oUtJ3UMO65OaTVHjfHyOzR7vBrgP WzkvZYqNu9ngUe7IU53wue4RxsgG7C578cKjVkgMadioDjGMVZtwQdlDu6PRXTkoUE fPJC4gVDIKoqDJokeryAQqLKppgsNUTsL3NOOfQQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Cheng Yongkang , Jens Axboe Subject: [PATCH 6.18 0981/1005] io_uring/net: fix multishot recv length limit accounting Date: Wed, 4 Nov 2026 16:11:54 -0500 Message-ID: <20261104211110.520521638@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261104211043.516122098@linuxfoundation.org> References: <20261104211043.516122098@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Cheng Yongkang Commit 3e3aebb7570ccdde5cc49c9bfc8fd3a436b71b0c upstream. io_recv_finish() debits sr->mshot_total_len with min_t(int, sel->val, sr->mshot_total_len). sel->val is the cumulative byte count of the request: on a bundle retry the receive path adds sr->done_io back to the return value, and the bundle branch in io_recv_finish() recovers the new bytes with this_ret = sel->val - sr->done_io. The debit therefore uses the wrong value after a bundle retry, and the int cast truncates a limit above INT_MAX. For an IORING_OP_RECV multishot request with optlen above INT_MAX, the limit becomes negative when cast to int, so the first completion debits the entire limit and ends the multishot with IORING_RECV_MSHOT_DONE while the socket still holds data that covers the limit. With 120 bytes queued, a 64-byte buffer and optlen 0x80000000, the first 64-byte CQE lacks IORING_CQE_F_MORE and 56 bytes remain unread; the same setup with optlen 0x7fffffff posts 64 and 56 bytes with F_MORE. After a bundle retry, the bytes already debited for the previous attempts are debited again, so the limit is exhausted early. With 1400 bytes queued, optlen 1000 and buffers of 600, 100, 100, 50, 50 and 200 bytes, the first attempt delivers 700 bytes and retries; the second delivers 200 more, but the debit accounts for 900 and finishes the request with a terminal 900-byte CQE while 500 bytes remain unread. The limit could have been reached. Debit only the bytes received by this invocation, sel->val - sr->done_io, and compare as unsigned so a limit above INT_MAX is accounted correctly. Non-bundle multishot requests keep sr->done_io at zero, so their accounting is unchanged. Fixes: 0ebc9a7ecf6a ("io_uring/net: Support multishot receive len cap") Cc: stable@vger.kernel.org Assisted-by: LLM Signed-off-by: Cheng Yongkang Link: https://patch.msgid.link/179328314078.648427.10086632105828535293@gmail.com [axboe: fix-up near-by incorrect comment while in there] Signed-off-by: Jens Axboe Signed-off-by: Greg Kroah-Hartman --- io_uring/net.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) --- a/io_uring/net.c +++ b/io_uring/net.c @@ -879,12 +879,15 @@ static inline bool io_recv_finish(struct cflags |= IORING_CQE_F_SOCK_NONEMPTY; if (sel->val > 0 && sr->flags & IORING_RECV_MSHOT_LIM) { + unsigned int this_len = sel->val - sr->done_io; + /* - * If sr->len hits zero, the limit has been reached. Mark - * mshot as finished, and flag MSHOT_DONE as well to prevent - * a potential bundle from being retried. + * If sr->mshot_total_len hits zero, the limit has been reached. + * Mark mshot as finished, and flag MSHOT_DONE as well to + * prevent a potential bundle from being retried. */ - sr->mshot_total_len -= min_t(int, sel->val, sr->mshot_total_len); + sr->mshot_total_len -= min_t(unsigned int, this_len, + sr->mshot_total_len); if (!sr->mshot_total_len) { sr->flags |= IORING_RECV_MSHOT_DONE; mshot_finished = true;