From: Paolo Abeni <[email protected]>

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: [email protected]
Signed-off-by: Paolo Abeni <[email protected]>
Reviewed-by: Matthieu Baerts (NGI0) <[email protected]>
Signed-off-by: Matthieu Baerts (NGI0) <[email protected]>
Link: 
https://patch.msgid.link/20260917-net-mptcp-misc-fixes-7-3-rc4-v2-3-0cf5c7266...@kernel.org
Signed-off-by: Jakub Kicinski <[email protected]>
(cherry picked from commit f3ef03357396d4b147d8e76c75fb612c2f264ffc)

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

Signed-off-by: Eva Kurchatova <[email protected]>
---
 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
[email protected]
https://lists.openvz.org/mailman/listinfo/devel

Reply via email to