[MPTCP][PATCH net-next 0/2] init ahmac and port of mptcp_options_received

[MPTCP][PATCH net-next 0/2] init ahmac and port of mptcp_options_received

[Geliang Tang]

This patchset deals with initializations of mptcp_options_received's two
fields, ahmac and port.

Geliang Tang (2):
  mptcp: initialize mptcp_options_received's ahmac
  mptcp: move mptcp_options_received's port initialization

 net/mptcp/options.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

-- 
2.26.2

[MPTCP][PATCH net-next 1/2] mptcp: initialize mptcp_options_received's ahmac

[Geliang Tang]

This patch initialize mptcp_options_received's ahmac to zero, otherwise it
will be a random number when receiving ADD_ADDR suboption with echo-flag=1.

Fixes: 3df523ab582c5 ("mptcp: Add ADD_ADDR handling")
Signed-off-by: Geliang Tang <geliangtang@gmail.com>
---
 net/mptcp/options.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net/mptcp/options.c b/net/mptcp/options.c
index 092a2d48bfd3..1ff3469938b6 100644
--- a/net/mptcp/options.c
+++ b/net/mptcp/options.c
@@ -297,6 +297,7 @@ void mptcp_get_options(const struct sk_buff *skb,
 	mp_opt->mp_capable = 0;
 	mp_opt->mp_join = 0;
 	mp_opt->add_addr = 0;
+	mp_opt->ahmac = 0;
 	mp_opt->rm_addr = 0;
 	mp_opt->dss = 0;
 
-- 
2.26.2

[MPTCP][PATCH net-next 2/2] mptcp: move mptcp_options_received's port initialization

[Geliang Tang]

This patch moved mptcp_options_received's port initialization from
mptcp_parse_option to mptcp_get_options, put it together with the other
fields initializations of mptcp_options_received.

Fixes: 3df523ab582c5 ("mptcp: Add ADD_ADDR handling")
Signed-off-by: Geliang Tang <geliangtang@gmail.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 1ff3469938b6..a044dd43411d 100644
--- a/net/mptcp/options.c
+++ b/net/mptcp/options.c
@@ -241,7 +241,6 @@ static void mptcp_parse_option(const struct sk_buff *skb,
 		}
 
 		mp_opt->add_addr = 1;
-		mp_opt->port = 0;
 		mp_opt->addr_id = *ptr++;
 		pr_debug("ADD_ADDR: id=%d, echo=%d", mp_opt->addr_id, mp_opt->echo);
 		if (mp_opt->family == MPTCP_ADDR_IPVERSION_4) {
@@ -298,6 +297,7 @@ void mptcp_get_options(const struct sk_buff *skb,
 	mp_opt->mp_join = 0;
 	mp_opt->add_addr = 0;
 	mp_opt->ahmac = 0;
+	mp_opt->port = 0;
 	mp_opt->rm_addr = 0;
 	mp_opt->dss = 0;
 
-- 
2.26.2

Re: [MPTCP][PATCH net-next 0/2] init ahmac and port of mptcp_options_received

[Matthieu Baerts]

Hi Geliang,

On 19/10/2020 12:23, Geliang Tang wrote:
> This patchset deals with initializations of mptcp_options_received's two
> fields, ahmac and port.
> 
> Geliang Tang (2):
>    mptcp: initialize mptcp_options_received's ahmac
>    mptcp: move mptcp_options_received's port initialization

Thank you for these two patches. They look good to me except one detail: 
these two patches are for -net and not net-next.

I don't know if it is alright for Jakub to apply them to -net or if it 
is clearer to re-send them with an updated subject.

If it is OK to apply them to -net without a re-submit, here is my:


Reviewed-by: Matthieu Baerts <matthieu.baerts@tessares.net>


Also, if you don't mind and while I am here, I never know: is it OK for 
you the maintainers to send one Acked/Reviewed-by for a whole series -- 
but then this is not reflected on patchwork -- or should we send one tag 
for each patch?

Cheers,
Matt
-- 
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net

Re: [MPTCP][PATCH net-next 0/2] init ahmac and port of mptcp_options_received

[Jakub Kicinski]

On Mon, 19 Oct 2020 18:27:55 +0200 Matthieu Baerts wrote:
> Hi Geliang,
> 
> On 19/10/2020 12:23, Geliang Tang wrote:
> > This patchset deals with initializations of mptcp_options_received's two
> > fields, ahmac and port.
> > 
> > Geliang Tang (2):
> >    mptcp: initialize mptcp_options_received's ahmac
> >    mptcp: move mptcp_options_received's port initialization  
> 
> Thank you for these two patches. They look good to me except one detail: 
> these two patches are for -net and not net-next.
> 
> I don't know if it is alright for Jakub to apply them to -net or if it 
> is clearer to re-send them with an updated subject.
> 
> If it is OK to apply them to -net without a re-submit, here is my:
> 
> Reviewed-by: Matthieu Baerts <matthieu.baerts@tessares.net>

Thanks, I can apply to net.

> Also, if you don't mind and while I am here, I never know: is it OK for 
> you the maintainers to send one Acked/Reviewed-by for a whole series -- 
> but then this is not reflected on patchwork -- or should we send one tag 
> for each patch?

It's fine, we propagate those semi-manually, but it's not a problem.
Hopefully patchwork will address this at some point :(

Re: [MPTCP][PATCH net-next 0/2] init ahmac and port of mptcp_options_received

[Matthieu Baerts]

Hi Jakub,

On 19/10/2020 22:40, Jakub Kicinski wrote:
> On Mon, 19 Oct 2020 18:27:55 +0200 Matthieu Baerts wrote:
>> Hi Geliang,
>>
>> On 19/10/2020 12:23, Geliang Tang wrote:
>>> This patchset deals with initializations of mptcp_options_received's two
>>> fields, ahmac and port.
>>>
>>> Geliang Tang (2):
>>>     mptcp: initialize mptcp_options_received's ahmac
>>>     mptcp: move mptcp_options_received's port initialization
>>
>> Thank you for these two patches. They look good to me except one detail:
>> these two patches are for -net and not net-next.
>>
>> I don't know if it is alright for Jakub to apply them to -net or if it
>> is clearer to re-send them with an updated subject.
>>
>> If it is OK to apply them to -net without a re-submit, here is my:
>>
>> Reviewed-by: Matthieu Baerts <matthieu.baerts@tessares.net>
> 
> Thanks, I can apply to net.

Great, thank you!

BTW, nice work with the maintenance of Net! More reasons for davem to 
take time recovering :)

> 
>> Also, if you don't mind and while I am here, I never know: is it OK for
>> you the maintainers to send one Acked/Reviewed-by for a whole series --
>> but then this is not reflected on patchwork -- or should we send one tag
>> for each patch?
> 
> It's fine, we propagate those semi-manually, but it's not a problem.
> Hopefully patchwork will address this at some point :(

Thank you for your reply, good to know!

Then next time, I will send these tags per patch to save you some 
semi-manual operations :)

Some preparation works have been done on patchwork side but the feature 
is not available yet:

   https://github.com/getpatchwork/patchwork/issues/113

Hopefully soon!

Cheers,
Matt
-- 
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net

Re: [MPTCP][PATCH net-next 0/2] init ahmac and port of mptcp_options_received

[Jakub Kicinski]

On Mon, 19 Oct 2020 18:23:14 +0800 Geliang Tang wrote:
> This patchset deals with initializations of mptcp_options_received's two
> fields, ahmac and port.

Applied, but two extra comments:
 - please make sure the commit messages are in imperative form
   e.g. "Initialize x..." rather than "This patches initializes x.."
 - I dropped the Fixes tag from patch 2, and only queued patch 1 for 
   stable - patch 2 is a minor clean up, right?

Thanks!

Re: [MPTCP][PATCH net-next 0/2] init ahmac and port of mptcp_options_received

[Geliang Tang]

Hi Jakub,

Jakub Kicinski <kuba@kernel.org> 于2020年10月21日周三 上午7:39写道：
>
> On Mon, 19 Oct 2020 18:23:14 +0800 Geliang Tang wrote:
> > This patchset deals with initializations of mptcp_options_received's two
> > fields, ahmac and port.
>
> Applied, but two extra comments:
>  - please make sure the commit messages are in imperative form
>    e.g. "Initialize x..." rather than "This patches initializes x.."
>  - I dropped the Fixes tag from patch 2, and only queued patch 1 for
>    stable - patch 2 is a minor clean up, right?

Yes, that's right. Thanks for applying and updating the patches.

-Geliang

>
> Thanks!