From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.openvz.org (mail.openvz.org [69.168.225.77]) by lore.virtuozzo.com (Postfix) with ESMTPS id 79B08803F6 for ; Mon, 16 Nov 2026 18:06:14 +0000 (UTC) Received: from mail.openvz.org (localhost [127.0.0.1]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6AGI4wR6030507; Mon, 16 Nov 2026 21:04:59 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AGI4wR6030507 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="Qp191n4v" Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6AGI4hkp030478 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Mon, 16 Nov 2026 21:04:43 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AGI4hkp030478 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-4a3705ea6ccso47918f8f.2 for ; Mon, 16 Nov 2026 10:04:43 -0800 (PST) X-Gm-Message-State: APuU4Z+4gUV8a+REb6a0xwhDejGmKxdxyKQI9hpZomJqrgFn9wO2Kcng y6qJl+4xqJYdUz7lgblK9heV8aA5HlhmxodRHdF1VW4oYmudfSsI3H6IxR0W0FfaKuWhGxXLhSw TKp8YpKdhwiQ9ZeFMAeXjIsL4wvrGgrLteF3raWck0TUGvNXyhm2yCg== X-Gm-Gg: AZFdTZdd9gw4kiazQpv3iIzDvmzS+zW5PiCR/h4+F1lOwcLhTO20VkerfzHoTDp7SaQ SyXcXKRUaEB/xHTz/IpYvOOgF82hvZW9z/kjZJLGyfnlrtza5UnVoV3omR9tLogg318bphKV4xt vBKoP3nNHlOR/Rju9Xgv8dAgndqtBx9Fd6h6jUc8S4qUsx3txj6IicX4Qre3YdoFmplAJARaaeF Jx/RPhqlKbFU3UFR6vVaILXh7Crwoee6m6DSS6R3r7S6aBxucCc15EAkrYEW4s8lXPQFRk+iHpb T6X6Ihv9X/L9PeKw8xAOUge+2ztZ1nBYOGLk4A4urSmXEbOkFEeq7OfLEyBHVm8mg8ldTQ2ac3K nhhLUn4JXwValkb//pJc7wUAL4w== X-Received: by 2002:a05:6000:22c2:b0:48d:ecba:3cf8 with SMTP id ffacd0b85a97d-49c741b1331mr26794668f8f.43.1794852283184; Mon, 16 Nov 2026 10:04:43 -0800 (PST) X-Received: by 2002:a05:6000:22c2:b0:48d:ecba:3cf8 with SMTP id ffacd0b85a97d-49c741b1331mr26794589f8f.43.1794852282593; Mon, 16 Nov 2026 10:04:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1794852282; cv=none; d=google.com; s=arc-20260327; b=bKobmyixy9+YLUDUcQkg209/gwggDsMm1V/Jbboct0ARfJRbxS2b1m1vFICZzcspY+ Tv6wMF/m7Y9ZikqE9HKxYMrbdHMJxteeNZTIBUFLo4Q7YJD7qbGNfsNZpAOq4lMojtW6 16tvtVFRlIngZL2/m3kZ4+OjMXBOFQMmdWBZziWujSC8LwXuiGEC6fDwI8iCQrIqgKDZ H3pvhdnWbHdcj3QEP3kWDfpAyUvKZcyYGIy5RqzHoIXqoJZiJsJfpsNn7IEPLcQR36zM q3DwCnDNlARytLDoZbe/4PoeWi6lrE+E2nm8A/q88S2G+t28Y1z1xiLoLz/0HCqK776G b5yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=2mL7dfFex0zvth46BqDvWdAoEyXCoTVoYBY8+IAx8Hk=; fh=WpT6aB7RBAGHZeWZzqAr71yzRFbPTYkPWKsRagLn48Q=; b=MpTMvsHeWSP8f6D63zBLjfDocvHYgA6nFMPBruRgUhtO2PoKGWtvQDXj2ISQRgZkp1 lUc1l78tK7uldW3icNTp1YupV6g6MhfYTKZKN6jX2TiP4P4Sl1bW32jL+DSOjQWIRrhE aNvxfYKr86WmlHjzJKSka2Yv1KNWwfB87o96JhQ4wcXghXk1fX1X8iLQYAso2S+9WwkF rPoN9LhILEmFPurZSpQ0oT6eYupHFnYgTPFvU0RPX0+cf2/dJ3NwS4tLKdt9gxa3kUo+ 14OZ3qRJT+axulU7aiZucQ1FjhrZretlUT/ie4WqCgZ407YRvj4cOFbudDYPzXSXf9Y6 r6Fg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=Qp191n4v; spf=pass (google.com: domain of eva.kurchatova@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=eva.kurchatova@virtuozzo.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com Received: from relay.virtuozzo.com (relay.virtuozzo.com. [130.117.225.111]) by mx.google.com with ESMTPS id ffacd0b85a97d-49c650cbfd6si23247808f8f.486.2026.11.16.10.04.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2026 10:04:42 -0800 (PST) Received-SPF: pass (google.com: domain of eva.kurchatova@virtuozzo.com designates 130.117.225.111 as permitted sender) client-ip=130.117.225.111; Authentication-Results: mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=Qp191n4v; spf=pass (google.com: domain of eva.kurchatova@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=eva.kurchatova@virtuozzo.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=virtuozzo.com; s=relay; h=MIME-Version:Message-ID:Date:Subject:From: Content-Type; bh=2mL7dfFex0zvth46BqDvWdAoEyXCoTVoYBY8+IAx8Hk=; b=Qp191n4vrBN3 iNKKuhNu/qXCahRsUZTMHBevkAkRVfF5SSTEZ71gc+DvaxMJ39LRmzMIq7p5bV463MGVqUl1LC5V7 vU/i8BOclJHy24oz+XYFM0f/NQ5jYNiX/hDwqbd8T3gfE9/DGvHbmnoHpqr2ehHOVMPE20n1F41mI Yl56X1uecsTwkhtoOBj0k/npqELVAqe0zALneCjGxev9c540cwcLk7pyUWhw9sbQI8eymmx5v/lRh RqxXvC+uFeFC/zZElxH5fZ7ddqi3/xY04iU1ytB5rzfc2xRpo11qMb2XpGT5k9JtwAHT2Bw73hyMK J0S/eEZZ3IyhjmcKXq7+Kg==; Received: from ch-vpn.virtuozzo.com ([130.117.225.6] helo=LekKit-T14) by relay.virtuozzo.com with esmtp (Exim 4.96) (envelope-from ) id 1xT106-008bMO-11; Mon, 16 Nov 2026 19:04:33 +0100 From: Eva Kurchatova To: khorenko@virtuozzo.com Date: Mon, 16 Nov 2026 20:03:04 +0200 Message-ID: <20261116180419.685520-7-eva.kurchatova@virtuozzo.com> X-Mailer: git-send-email 2.56.1 In-Reply-To: <20261116180419.685520-3-eva.kurchatova@virtuozzo.com> References: <20261116180419.685520-3-eva.kurchatova@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 4/4] ms/mptcp: fix bad accounting in __mptcp_subflow_push_pending() X-BeenThere: devel@openvz.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: OpenVZ development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: devel-bounces@openvz.org Errors-To: devel-bounces@openvz.org From: Paolo Abeni If __subflow_push_pending() errors out we should avoid updating the copied byte counters, to avoid mismatch push call later on. Fixes: 0fa1b3783a17 ("mptcp: use get_send wrapper") Cc: stable@vger.kernel.org Signed-off-by: Paolo Abeni Reviewed-by: Matthieu Baerts (NGI0) Signed-off-by: Matthieu Baerts (NGI0) Link: https://patch.msgid.link/20260917-net-mptcp-misc-fixes-7-3-rc4-v2-3-0cf5c72667c8@kernel.org Signed-off-by: Jakub Kicinski (cherry picked from commit f3ef03357396d4b147d8e76c75fb612c2f264ffc) https://virtuozzo.atlassian.net/browse/VSTOR-155322 Feature: fix ms/net Signed-off-by: Eva Kurchatova --- net/mptcp/protocol.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 685c8a395476..93e511f8d943 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1624,7 +1624,8 @@ static void __mptcp_subflow_push_pending(struct sock *sk, struct sock *ssk, bool ret = __subflow_push_pending(sk, ssk, &info); if (ret <= 0) keep_pushing = false; - copied += ret; + else + copied += ret; } mptcp_for_each_subflow(msk, subflow) { -- 2.56.1 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel