[MPTCP] [PATCH v3 06/10] Fix return value if no DSS option is created.

[MPTCP] [PATCH v3 06/10] Fix return value if no DSS option is created.

[Peter Krystad]

[-- Attachment #1: Type: text/plain, Size: 700 bytes --]

Strictly speaking mptcp_established_options_dss() should
return false if no DSS option is created.

squashto: Write MPTCP DSS headers to outgoing data packets

Signed-off-by: Peter Krystad <peter.krystad(a)linux.intel.com>
---
 net/mptcp/options.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/net/mptcp/options.c b/net/mptcp/options.c
index 1f54c543304e..01f59ad629e5 100644
--- a/net/mptcp/options.c
+++ b/net/mptcp/options.c
@@ -400,6 +400,9 @@ static bool mptcp_established_options_dss(struct sock *sk, struct sk_buff *skb,
 		WARN(1, "MPTCP: Ack dropped");
 	}
 
+	if (!dss_size)
+		return false;
+
 	*size = ALIGN(dss_size, 4);
 	return true;
 }
-- 
2.17.2

Re: [MPTCP] [PATCH v3 06/10] Fix return value if no DSS option is created.

[Matthieu Baerts]

[-- Attachment #1: Type: text/plain, Size: 610 bytes --]

Hi Peter, Paolo, Mat,

On 08/08/2019 00:44, Peter Krystad wrote:
> Strictly speaking mptcp_established_options_dss() should
> return false if no DSS option is created.
> 
> squashto: Write MPTCP DSS headers to outgoing data packets

Thank you for the patch and the reviews!

- 7b039830202c: "squashed" in "mptcp: Write MPTCP DSS headers to
outgoing data packets"
- 009b132dc29d..06256d7cf989: result

Cheers,
Matt
-- 
Matthieu Baerts | R&D Engineer
matthieu.baerts(a)tessares.net
Tessares SA | Hybrid Access Solutions
www.tessares.net
1 Avenue Jean Monnet, 1348 Louvain-la-Neuve, Belgium