All Virtuozzo development lists (kernel + QEMU)
 help / color / mirror / Atom feed
From: Eva Kurchatova <eva.kurchatova@virtuozzo.com>
To: khorenko@virtuozzo.com
Cc: devel@openvz.org
Subject: [Devel] [PATCH hci-8.1 4/4] ms/mptcp: fix bad accounting in __mptcp_subflow_push_pending()
Date: Mon, 16 Nov 2026 20:03:04 +0200	[thread overview]
Message-ID: <20261116180419.685520-7-eva.kurchatova@virtuozzo.com> (raw)
In-Reply-To: <20261116180419.685520-3-eva.kurchatova@virtuozzo.com>

From: Paolo Abeni <pabeni@redhat.com>

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 <pabeni@redhat.com>
Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20260917-net-mptcp-misc-fixes-7-3-rc4-v2-3-0cf5c72667c8@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
(cherry picked from commit f3ef03357396d4b147d8e76c75fb612c2f264ffc)

https://virtuozzo.atlassian.net/browse/VSTOR-155322
Feature: fix ms/net

Signed-off-by: Eva Kurchatova <eva.kurchatova@virtuozzo.com>
---
 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

  parent reply	other threads:[~2026-11-16 18:06 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-16 18:03 [Devel] [PATCH hci-8.1 0/4] ms/mptcp: backport cc-stable fixes Eva Kurchatova
2026-11-16 18:03 ` [Devel] [PATCH hci-8.1 1/4] ms/mptcp: reset rcv wnd on disconnect Eva Kurchatova
2026-11-16 18:09   ` no-reply
2026-11-17 11:29   ` Konstantin Khorenko
2026-11-16 18:03 ` [Devel] [PATCH hci-8.1 2/4] ms/mptcp: prevent race between disconnect() and rtx Eva Kurchatova
2026-11-16 18:08   ` no-reply
2026-11-17 11:29   ` Konstantin Khorenko
2026-11-16 18:03 ` [Devel] [PATCH hci-8.1 3/4] ms/mptcp: close race between scheduler and state change Eva Kurchatova
2026-11-16 18:10   ` no-reply
2026-11-16 18:03 ` Eva Kurchatova [this message]
2026-11-16 18:10   ` [Devel] [PATCH hci-8.1 4/4] ms/mptcp: fix bad accounting in __mptcp_subflow_push_pending() no-reply
2026-11-17 11:29 ` [Devel] [PATCH hci-8.1 0/4] ms/mptcp: backport cc-stable fixes Konstantin Khorenko

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20261116180419.685520-7-eva.kurchatova@virtuozzo.com \
    --to=eva.kurchatova@virtuozzo.com \
    --cc=devel@openvz.org \
    --cc=khorenko@virtuozzo.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.