[MPTCP] [PATCH v3 03/10] Fix parsing MP_JOIN third ACK.

[MPTCP] [PATCH v3 03/10] Fix parsing MP_JOIN third ACK.

[Peter Krystad]

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

There is a reserved byte of zero's in there.

squashto: Add handling of incoming MP_JOIN requests

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

diff --git a/net/mptcp/options.c b/net/mptcp/options.c
index ab3fce071c17..a1920574161d 100644
--- a/net/mptcp/options.c
+++ b/net/mptcp/options.c
@@ -92,7 +92,7 @@ void mptcp_parse_option(const unsigned char *ptr, int opsize,
 				 mp_opt->backup, mp_opt->join_id,
 				 mp_opt->thmac, mp_opt->nonce);
 		} else if (opsize == TCPOLEN_MPTCP_MPJ_ACK) {
-			ptr++;
+			ptr += 2;
 			memcpy(mp_opt->hmac, ptr, MPTCPOPT_HMAC_LEN);
 			pr_debug("MP_JOIN hmac");
 		} else {
-- 
2.17.2

Re: [MPTCP] [PATCH v3 03/10] Fix parsing MP_JOIN third ACK.

[Matthieu Baerts]

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

Hi Peter, Paolo, Mat,

On 08/08/2019 00:44, Peter Krystad wrote:
> There is a reserved byte of zero's in there.
> 
> squashto: Add handling of incoming MP_JOIN requests

Thank you for the patch and the reviews!

- 1437af3a308a: "squashed" in "mptcp: Add handling of incoming MP_JOIN
requests"
- 34fd270ae102..6c6c0f074bf5: 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