mptcp: Deal with family field being removed from mptcp_options_received
Subsystems (2)
Peter Krystad
PATCH 1/1 mptcp: Deal with family field being removed from mptcp_options_received
Use individual add_addr flags instead.
squashto: Add path manager interface
--- net/mptcp/options.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
net/mptcp/options.c +8 -5
@@ -621,15 +621,18 @@ void mptcp_incoming_options(struct sock *sk, struct sk_buff *skb,if (!check_fourth_ack (subflow, skb, mp_opt))return ; -if (msk && mp_opt->add_addr) { -if (mp_opt->family ==MPTCP_ADDR_IPVERSION_4 ) +if (msk) { +if (mp_opt->add_addr) {mptcp_pm_add_addr (msk, &mp_opt->addr, mp_opt->addr_id); + mp_opt->add_addr =0 ; + }#if IS_ENABLED (CONFIG_MPTCP_IPV6 ) - else if (mp_opt->family == MPTCP_ADDR_IPVERSION_6) + else if (mp_opt->add_addr6) {mptcp_pm_add_addr6 (msk, &mp_opt->addr6, - mp_opt->addr_id); + mp_opt->addr6_id); + mp_opt->add_addr6 =0 ; + }#endif - mp_opt->add_addr =0 ; }if (!mp_opt->dss)
Signature · 1 line
2.17.2
Mat Martineau
Quoted 5 lines · Peter Krystad
Use individual
add_addrflags instead.squashto: Add path manager interface
Signed-off-by Peter Krystad <peter.krystad(a)linux.intel.com>
I ran in to conflicts each time I tried to apply the six patches, applying each patch at the noted squashto commit. Made an attempt with an older export branch too). I'm not sure of the best way to share "squashto" changes that introduce merge conflicts, but it's hard to take a look at the overall changes from this group of patches.
Now that there's overlap in the data for MP_CAPABLE, MP_JOIN, DSS, and ADD_ADDR, should there also be more checking in mptcp_parse_options() to ensure only supported combinations are allowed to write in to the structure? We've made some assumptions regarding what will fit, but different combinations/orders of MPTCP options could overwrite values in interesting (and potentially harmful) ways.
Mat
Quoted 38 lines
---
net/mptcp/options.c| 13 ++++++++-----1 file changed, 8 insertions(+), 5 deletions(-)net/mptcp/options.c +8
-5@@ -621,15 +621,18 @@ void mptcp_incoming_options(struct sock *sk, struct sk_buff *skb,if (!check_fourth_ack (subflow, skb, mp_opt))return ; -if (msk && mp_opt->add_addr) { -if (mp_opt->family ==MPTCP_ADDR_IPVERSION_4 ) +if (msk) { +if (mp_opt->add_addr) {mptcp_pm_add_addr (msk, &mp_opt->addr, mp_opt->addr_id); + mp_opt->add_addr =0 ; + }#if IS_ENABLED (CONFIG_MPTCP_IPV6 ) - else if (mp_opt->family == MPTCP_ADDR_IPVERSION_6) + else if (mp_opt->add_addr6) {mptcp_pm_add_addr6 (msk, &mp_opt->addr6, - mp_opt->addr_id); + mp_opt->addr6_id); + mp_opt->add_addr6 =0 ; + }#endif - mp_opt->add_addr =0 ; }if (!mp_opt->dss)Signature · 4 lines
2.17.2 _______________________________________________ mptcp mailing list -- mptcp(a)lists.01.org To unsubscribe send an email to mptcp-leave(a)lists.01.org
--
Mat Martineau
Intel
Peter Krystad
Quoted 6 lines · Mat Martineau
Quoted 4 lines · Peter Krystad
Use individual
add_addrflags instead.squashto: Add path manager interface
Quoted 7 lines
Quoted 1 line
Signed-off-by Peter Krystad <peter.krystad(a)linux.intel.com>I ran in to conflicts each time I tried to apply the six patches, applying each patch at the noted squashto commit. Made an attempt with an older export branch too). I'm not sure of the best way to share "squashto" changes that introduce merge conflicts, but it's hard to take a look at the overall changes from this group of patches.
I pushed my tree, with the two commits from Wednesday already squashed, and the four from last night in position, to
https://github.com/pkrystad/mptcp_net-next/tree/optimize-0116
Quoted 6 lines
Now that there's overlap in the data for
MP_CAPABLE,MP_JOIN, DSS, andADD_ADDR, should there also be more checking inmptcp_parse_options()to ensure only supported combinations are allowed to write in to the structure? We've made some assumptions regarding what will fit, but different combinations/orders of MPTCP options could overwrite values in interesting (and potentially harmful) ways.
Sure, this would make it explicit what we're expecting is possible. I'll add such checks.
Peter.
Quoted 45 lines
Mat
Quoted 38 lines
---
net/mptcp/options.c| 13 ++++++++-----1 file changed, 8 insertions(+), 5 deletions(-)net/mptcp/options.c +8
-5@@ -621,15 +621,18 @@ void mptcp_incoming_options(struct sock *sk, struct sk_buff *skb,if (!check_fourth_ack (subflow, skb, mp_opt))return ; -if (msk && mp_opt->add_addr) { -if (mp_opt->family ==MPTCP_ADDR_IPVERSION_4 ) +if (msk) { +if (mp_opt->add_addr) {mptcp_pm_add_addr (msk, &mp_opt->addr, mp_opt->addr_id); + mp_opt->add_addr =0 ; + }#if IS_ENABLED (CONFIG_MPTCP_IPV6 ) - else if (mp_opt->family == MPTCP_ADDR_IPVERSION_6) + else if (mp_opt->add_addr6) {mptcp_pm_add_addr6 (msk, &mp_opt->addr6, - mp_opt->addr_id); + mp_opt->addr6_id); + mp_opt->add_addr6 =0 ; + }#endif - mp_opt->add_addr =0 ; }if (!mp_opt->dss)Signature · 4 lines
2.17.2 _______________________________________________ mptcp mailing list -- mptcp(a)lists.01.org To unsubscribe send an email to mptcp-leave(a)lists.01.org--
Mat Martineau
Intel