From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A04F6CA0EC7 for ; Mon, 11 Sep 2023 22:50:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230345AbjIKWto (ORCPT ); Mon, 11 Sep 2023 18:49:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35728 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239508AbjIKOWc (ORCPT ); Mon, 11 Sep 2023 10:22:32 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 063F3CF0 for ; Mon, 11 Sep 2023 07:22:28 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5081CC433C8; Mon, 11 Sep 2023 14:22:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1694442147; bh=AvOpcfc29CajKSYRwpFUugaxM6+M8KtxXa76JIKIUDo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mfcjU2BqLr4D1wrekjt5nO17NpmOzkYO6g5ZnKt+3yefpwg/T7WaHPoEAvhoY0dy0 gdKPF6+YJAKJAtJn1dajxKkHrBfpuU4HVunhgmBZE0twidguAG5y8EYlH4gEnAxkKP uumJaGjsq5VJJarJf2V6c/d3g+oEXEZR7TNppaRo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Pavel Begunkov , Jens Axboe Subject: [PATCH 6.5 662/739] io_uring/net: dont overflow multishot accept Date: Mon, 11 Sep 2023 15:47:41 +0200 Message-ID: <20230911134709.597636464@linuxfoundation.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230911134650.921299741@linuxfoundation.org> References: <20230911134650.921299741@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 6.5-stable review patch. If anyone has any objections, please let me know. ------------------ From: Pavel Begunkov commit 1bfed23349716a7811645336a7ce42c4b8f250bc upstream. Don't allow overflowing multishot accept CQEs, we want to limit the grows of the overflow list. Cc: stable@vger.kernel.org Fixes: 4e86a2c980137 ("io_uring: implement multishot mode for accept") Signed-off-by: Pavel Begunkov Link: https://lore.kernel.org/r/7d0d749649244873772623dd7747966f516fe6e2.1691757663.git.asml.silence@gmail.com Signed-off-by: Jens Axboe Signed-off-by: Greg Kroah-Hartman --- io_uring/net.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/io_uring/net.c +++ b/io_uring/net.c @@ -1367,7 +1367,7 @@ retry: if (ret < 0) return ret; if (io_aux_cqe(req, issue_flags & IO_URING_F_COMPLETE_DEFER, ret, - IORING_CQE_F_MORE, true)) + IORING_CQE_F_MORE, false)) goto retry; return -ECANCELED;