* [PATCH V2 -next] mptcp/pm_netlink.c : add check for nla_put_in/6_addr
@ 2020-04-22 1:34 ` Bo YU
0 siblings, 0 replies; 8+ messages in thread
From: Bo YU @ 2020-04-22 1:34 UTC (permalink / raw
To: matthieu.baerts, davem, kuba, pabeni, mathew.j.martineau
Cc: netdev, mptcp, tsu.yubo
Normal there should be checked for nla_put_in6_addr like other
usage in net.
Detected by CoverityScan, CID# 1461639
Fixes: 01cacb00b35c("mptcp: add netlink-based PM")
Signed-off-by: Bo YU <tsu.yubo@gmail.com>
---
V2: Add check for nla_put_in_addr suggested by Paolo Abeni
---
net/mptcp/pm_netlink.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
index 86d61ab34c7c..0a39f0ebad76 100644
--- a/net/mptcp/pm_netlink.c
+++ b/net/mptcp/pm_netlink.c
@@ -599,12 +599,15 @@ static int mptcp_nl_fill_addr(struct sk_buff *skb,
nla_put_s32(skb, MPTCP_PM_ADDR_ATTR_IF_IDX, entry->ifindex))
goto nla_put_failure;
- if (addr->family == AF_INET)
+ if (addr->family == AF_INET &&
nla_put_in_addr(skb, MPTCP_PM_ADDR_ATTR_ADDR4,
- addr->addr.s_addr);
+ addr->addr.s_addr))
+ goto nla_put_failure;
+
#if IS_ENABLED(CONFIG_MPTCP_IPV6)
- else if (addr->family == AF_INET6)
- nla_put_in6_addr(skb, MPTCP_PM_ADDR_ATTR_ADDR6, &addr->addr6);
+ else if (addr->family == AF_INET6 &&
+ nla_put_in6_addr(skb, MPTCP_PM_ADDR_ATTR_ADDR6, &addr->addr6))
+ goto nla_put_failure;
#endif
nla_nest_end(skb, attr);
return 0;
--
2.11.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [MPTCP] [PATCH V2 -next] mptcp/pm_netlink.c : add check for nla_put_in/6_addr
@ 2020-04-22 1:34 ` Bo YU
0 siblings, 0 replies; 8+ messages in thread
From: Bo YU @ 2020-04-22 1:34 UTC (permalink / raw
To: mptcp
[-- Attachment #1: Type: text/plain, Size: 1251 bytes --]
Normal there should be checked for nla_put_in6_addr like other
usage in net.
Detected by CoverityScan, CID# 1461639
Fixes: 01cacb00b35c("mptcp: add netlink-based PM")
Signed-off-by: Bo YU <tsu.yubo(a)gmail.com>
---
V2: Add check for nla_put_in_addr suggested by Paolo Abeni
---
net/mptcp/pm_netlink.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
index 86d61ab34c7c..0a39f0ebad76 100644
--- a/net/mptcp/pm_netlink.c
+++ b/net/mptcp/pm_netlink.c
@@ -599,12 +599,15 @@ static int mptcp_nl_fill_addr(struct sk_buff *skb,
nla_put_s32(skb, MPTCP_PM_ADDR_ATTR_IF_IDX, entry->ifindex))
goto nla_put_failure;
- if (addr->family == AF_INET)
+ if (addr->family == AF_INET &&
nla_put_in_addr(skb, MPTCP_PM_ADDR_ATTR_ADDR4,
- addr->addr.s_addr);
+ addr->addr.s_addr))
+ goto nla_put_failure;
+
#if IS_ENABLED(CONFIG_MPTCP_IPV6)
- else if (addr->family == AF_INET6)
- nla_put_in6_addr(skb, MPTCP_PM_ADDR_ATTR_ADDR6, &addr->addr6);
+ else if (addr->family == AF_INET6 &&
+ nla_put_in6_addr(skb, MPTCP_PM_ADDR_ATTR_ADDR6, &addr->addr6))
+ goto nla_put_failure;
#endif
nla_nest_end(skb, attr);
return 0;
--
2.11.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH V2 -next] mptcp/pm_netlink.c : add check for nla_put_in/6_addr
@ 2020-04-22 10:12 ` Paolo Abeni
0 siblings, 0 replies; 8+ messages in thread
From: Paolo Abeni @ 2020-04-22 10:12 UTC (permalink / raw
To: Bo YU, matthieu.baerts, davem, kuba, mathew.j.martineau; +Cc: netdev, mptcp
On Wed, 2020-04-22 at 09:34 +0800, Bo YU wrote:
> Normal there should be checked for nla_put_in6_addr like other
> usage in net.
>
> Detected by CoverityScan, CID# 1461639
>
> Fixes: 01cacb00b35c("mptcp: add netlink-based PM")
> Signed-off-by: Bo YU <tsu.yubo@gmail.com>
> ---
> V2: Add check for nla_put_in_addr suggested by Paolo Abeni
Thank you for addressing my feedback!
> ---
> net/mptcp/pm_netlink.c | 11 +++++++----
> 1 file changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
> index 86d61ab34c7c..0a39f0ebad76 100644
> --- a/net/mptcp/pm_netlink.c
> +++ b/net/mptcp/pm_netlink.c
> @@ -599,12 +599,15 @@ static int mptcp_nl_fill_addr(struct sk_buff *skb,
> nla_put_s32(skb, MPTCP_PM_ADDR_ATTR_IF_IDX, entry->ifindex))
> goto nla_put_failure;
>
> - if (addr->family == AF_INET)
> + if (addr->family == AF_INET &&
> nla_put_in_addr(skb, MPTCP_PM_ADDR_ATTR_ADDR4,
> - addr->addr.s_addr);
> + addr->addr.s_addr))
> + goto nla_put_failure;
> +
I'm very sorry about the nit-picking, but the above is now a single
statement, and indentation should be adjusted accordingly:
'nla_put_in_addr()' should be aligned with 'addr->family'.
The same applies to the chunk below.
> #if IS_ENABLED(CONFIG_MPTCP_IPV6)
> - else if (addr->family == AF_INET6)
> - nla_put_in6_addr(skb, MPTCP_PM_ADDR_ATTR_ADDR6, &addr->addr6);
> + else if (addr->family == AF_INET6 &&
> + nla_put_in6_addr(skb, MPTCP_PM_ADDR_ATTR_ADDR6, &addr->addr6))
> + goto nla_put_failure;
> #endif
> nla_nest_end(skb, attr);
> return 0;
Otherwise LGTM, thanks!
Paolo
^ permalink raw reply [flat|nested] 8+ messages in thread
* [MPTCP] Re: [PATCH V2 -next] mptcp/pm_netlink.c : add check for nla_put_in/6_addr
@ 2020-04-22 10:12 ` Paolo Abeni
0 siblings, 0 replies; 8+ messages in thread
From: Paolo Abeni @ 2020-04-22 10:12 UTC (permalink / raw
To: mptcp
[-- Attachment #1: Type: text/plain, Size: 1674 bytes --]
On Wed, 2020-04-22 at 09:34 +0800, Bo YU wrote:
> Normal there should be checked for nla_put_in6_addr like other
> usage in net.
>
> Detected by CoverityScan, CID# 1461639
>
> Fixes: 01cacb00b35c("mptcp: add netlink-based PM")
> Signed-off-by: Bo YU <tsu.yubo(a)gmail.com>
> ---
> V2: Add check for nla_put_in_addr suggested by Paolo Abeni
Thank you for addressing my feedback!
> ---
> net/mptcp/pm_netlink.c | 11 +++++++----
> 1 file changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
> index 86d61ab34c7c..0a39f0ebad76 100644
> --- a/net/mptcp/pm_netlink.c
> +++ b/net/mptcp/pm_netlink.c
> @@ -599,12 +599,15 @@ static int mptcp_nl_fill_addr(struct sk_buff *skb,
> nla_put_s32(skb, MPTCP_PM_ADDR_ATTR_IF_IDX, entry->ifindex))
> goto nla_put_failure;
>
> - if (addr->family == AF_INET)
> + if (addr->family == AF_INET &&
> nla_put_in_addr(skb, MPTCP_PM_ADDR_ATTR_ADDR4,
> - addr->addr.s_addr);
> + addr->addr.s_addr))
> + goto nla_put_failure;
> +
I'm very sorry about the nit-picking, but the above is now a single
statement, and indentation should be adjusted accordingly:
'nla_put_in_addr()' should be aligned with 'addr->family'.
The same applies to the chunk below.
> #if IS_ENABLED(CONFIG_MPTCP_IPV6)
> - else if (addr->family == AF_INET6)
> - nla_put_in6_addr(skb, MPTCP_PM_ADDR_ATTR_ADDR6, &addr->addr6);
> + else if (addr->family == AF_INET6 &&
> + nla_put_in6_addr(skb, MPTCP_PM_ADDR_ATTR_ADDR6, &addr->addr6))
> + goto nla_put_failure;
> #endif
> nla_nest_end(skb, attr);
> return 0;
Otherwise LGTM, thanks!
Paolo
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH V2 -next] mptcp/pm_netlink.c : add check for nla_put_in/6_addr
@ 2020-04-22 14:56 ` Bo YU
0 siblings, 0 replies; 8+ messages in thread
From: Bo YU @ 2020-04-22 14:56 UTC (permalink / raw
To: Paolo Abeni
Cc: matthieu.baerts, davem, kuba, mathew.j.martineau, netdev, mptcp
On Wed, Apr 22, 2020 at 12:12:27PM +0200, Paolo Abeni wrote:
>On Wed, 2020-04-22 at 09:34 +0800, Bo YU wrote:
>> Normal there should be checked for nla_put_in6_addr like other
>> usage in net.
>>
>> Detected by CoverityScan, CID# 1461639
>>
>> Fixes: 01cacb00b35c("mptcp: add netlink-based PM")
>> Signed-off-by: Bo YU <tsu.yubo@gmail.com>
>> ---
>> V2: Add check for nla_put_in_addr suggested by Paolo Abeni
>
>Thank you for addressing my feedback!
>
>> ---
>> net/mptcp/pm_netlink.c | 11 +++++++----
>> 1 file changed, 7 insertions(+), 4 deletions(-)
>>
>> diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
>> index 86d61ab34c7c..0a39f0ebad76 100644
>> --- a/net/mptcp/pm_netlink.c
>> +++ b/net/mptcp/pm_netlink.c
>> @@ -599,12 +599,15 @@ static int mptcp_nl_fill_addr(struct sk_buff *skb,
>> nla_put_s32(skb, MPTCP_PM_ADDR_ATTR_IF_IDX, entry->ifindex))
>> goto nla_put_failure;
>>
>> - if (addr->family == AF_INET)
>> + if (addr->family == AF_INET &&
>> nla_put_in_addr(skb, MPTCP_PM_ADDR_ATTR_ADDR4,
>> - addr->addr.s_addr);
>> + addr->addr.s_addr))
>> + goto nla_put_failure;
>> +
>
>I'm very sorry about the nit-picking, but the above is now a single
>statement, and indentation should be adjusted accordingly:
>'nla_put_in_addr()' should be aligned with 'addr->family'.
Ok, but i just want to make clear for that, do you mean:
if (addr->family == AF_INET && nla_put_in_addr(skb,
MPTCP_PM_ADDR_ATTR_ADDR4, addr->addr.s_addr))
In fact, i was upset by checkpatch about over 80 chars warning.
This is my originally version patch to fix it :(. If i was wrong
to understand your means, please correct me. Thank you.
>
>The same applies to the chunk below.
>
>> #if IS_ENABLED(CONFIG_MPTCP_IPV6)
>> - else if (addr->family == AF_INET6)
>> - nla_put_in6_addr(skb, MPTCP_PM_ADDR_ATTR_ADDR6, &addr->addr6);
>> + else if (addr->family == AF_INET6 &&
>> + nla_put_in6_addr(skb, MPTCP_PM_ADDR_ATTR_ADDR6, &addr->addr6))
>> + goto nla_put_failure;
>> #endif
>> nla_nest_end(skb, attr);
>> return 0;
>
>Otherwise LGTM, thanks!
>
>Paolo
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [MPTCP] Re: [PATCH V2 -next] mptcp/pm_netlink.c : add check for nla_put_in/6_addr
@ 2020-04-22 14:56 ` Bo YU
0 siblings, 0 replies; 8+ messages in thread
From: Bo YU @ 2020-04-22 14:56 UTC (permalink / raw
To: mptcp
[-- Attachment #1: Type: text/plain, Size: 2144 bytes --]
On Wed, Apr 22, 2020 at 12:12:27PM +0200, Paolo Abeni wrote:
>On Wed, 2020-04-22 at 09:34 +0800, Bo YU wrote:
>> Normal there should be checked for nla_put_in6_addr like other
>> usage in net.
>>
>> Detected by CoverityScan, CID# 1461639
>>
>> Fixes: 01cacb00b35c("mptcp: add netlink-based PM")
>> Signed-off-by: Bo YU <tsu.yubo(a)gmail.com>
>> ---
>> V2: Add check for nla_put_in_addr suggested by Paolo Abeni
>
>Thank you for addressing my feedback!
>
>> ---
>> net/mptcp/pm_netlink.c | 11 +++++++----
>> 1 file changed, 7 insertions(+), 4 deletions(-)
>>
>> diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
>> index 86d61ab34c7c..0a39f0ebad76 100644
>> --- a/net/mptcp/pm_netlink.c
>> +++ b/net/mptcp/pm_netlink.c
>> @@ -599,12 +599,15 @@ static int mptcp_nl_fill_addr(struct sk_buff *skb,
>> nla_put_s32(skb, MPTCP_PM_ADDR_ATTR_IF_IDX, entry->ifindex))
>> goto nla_put_failure;
>>
>> - if (addr->family == AF_INET)
>> + if (addr->family == AF_INET &&
>> nla_put_in_addr(skb, MPTCP_PM_ADDR_ATTR_ADDR4,
>> - addr->addr.s_addr);
>> + addr->addr.s_addr))
>> + goto nla_put_failure;
>> +
>
>I'm very sorry about the nit-picking, but the above is now a single
>statement, and indentation should be adjusted accordingly:
>'nla_put_in_addr()' should be aligned with 'addr->family'.
Ok, but i just want to make clear for that, do you mean:
if (addr->family == AF_INET && nla_put_in_addr(skb,
MPTCP_PM_ADDR_ATTR_ADDR4, addr->addr.s_addr))
In fact, i was upset by checkpatch about over 80 chars warning.
This is my originally version patch to fix it :(. If i was wrong
to understand your means, please correct me. Thank you.
>
>The same applies to the chunk below.
>
>> #if IS_ENABLED(CONFIG_MPTCP_IPV6)
>> - else if (addr->family == AF_INET6)
>> - nla_put_in6_addr(skb, MPTCP_PM_ADDR_ATTR_ADDR6, &addr->addr6);
>> + else if (addr->family == AF_INET6 &&
>> + nla_put_in6_addr(skb, MPTCP_PM_ADDR_ATTR_ADDR6, &addr->addr6))
>> + goto nla_put_failure;
>> #endif
>> nla_nest_end(skb, attr);
>> return 0;
>
>Otherwise LGTM, thanks!
>
>Paolo
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH V2 -next] mptcp/pm_netlink.c : add check for nla_put_in/6_addr
@ 2020-04-22 15:48 ` Paolo Abeni
0 siblings, 0 replies; 8+ messages in thread
From: Paolo Abeni @ 2020-04-22 15:48 UTC (permalink / raw
To: Bo YU; +Cc: matthieu.baerts, davem, kuba, mathew.j.martineau, netdev, mptcp
On Wed, 2020-04-22 at 22:56 +0800, Bo YU wrote:
> On Wed, Apr 22, 2020 at 12:12:27PM +0200, Paolo Abeni wrote:
> > On Wed, 2020-04-22 at 09:34 +0800, Bo YU wrote:
> > > Normal there should be checked for nla_put_in6_addr like other
> > > usage in net.
> > >
> > > Detected by CoverityScan, CID# 1461639
> > >
> > > Fixes: 01cacb00b35c("mptcp: add netlink-based PM")
> > > Signed-off-by: Bo YU <tsu.yubo@gmail.com>
> > > ---
> > > V2: Add check for nla_put_in_addr suggested by Paolo Abeni
> >
> > Thank you for addressing my feedback!
> >
> > > ---
> > > net/mptcp/pm_netlink.c | 11 +++++++----
> > > 1 file changed, 7 insertions(+), 4 deletions(-)
> > >
> > > diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
> > > index 86d61ab34c7c..0a39f0ebad76 100644
> > > --- a/net/mptcp/pm_netlink.c
> > > +++ b/net/mptcp/pm_netlink.c
> > > @@ -599,12 +599,15 @@ static int mptcp_nl_fill_addr(struct sk_buff *skb,
> > > nla_put_s32(skb, MPTCP_PM_ADDR_ATTR_IF_IDX, entry->ifindex))
> > > goto nla_put_failure;
> > >
> > > - if (addr->family == AF_INET)
> > > + if (addr->family == AF_INET &&
> > > nla_put_in_addr(skb, MPTCP_PM_ADDR_ATTR_ADDR4,
> > > - addr->addr.s_addr);
> > > + addr->addr.s_addr))
> > > + goto nla_put_failure;
> > > +
> >
> > I'm very sorry about the nit-picking, but the above is now a single
> > statement, and indentation should be adjusted accordingly:
> > 'nla_put_in_addr()' should be aligned with 'addr->family'.
> Ok, but i just want to make clear for that, do you mean:
>
>
> if (addr->family == AF_INET && nla_put_in_addr(skb,
> MPTCP_PM_ADDR_ATTR_ADDR4, addr->addr.s_addr))
>
> In fact, i was upset by checkpatch about over 80 chars warning.
> This is my originally version patch to fix it :(. If i was wrong
> to understand your means, please correct me. Thank you.
I mean:
if (addr->family == AF_INET &&
nla_put_in_addr(skb, MPTCP_PM_ADDR_ATTR_ADDR4,
addr->addr.s_addr))
note that [the first char of] 'nla_put_in_addr' is aligned with [the
first char of] 'addr->family', and 'addr->addr.s_addr' with 'skb'.
Please, nota that the same applies to nla_put_in6_addr() below.
Thanks!
Paolo
^ permalink raw reply [flat|nested] 8+ messages in thread
* [MPTCP] Re: [PATCH V2 -next] mptcp/pm_netlink.c : add check for nla_put_in/6_addr
@ 2020-04-22 15:48 ` Paolo Abeni
0 siblings, 0 replies; 8+ messages in thread
From: Paolo Abeni @ 2020-04-22 15:48 UTC (permalink / raw
To: mptcp
[-- Attachment #1: Type: text/plain, Size: 2239 bytes --]
On Wed, 2020-04-22 at 22:56 +0800, Bo YU wrote:
> On Wed, Apr 22, 2020 at 12:12:27PM +0200, Paolo Abeni wrote:
> > On Wed, 2020-04-22 at 09:34 +0800, Bo YU wrote:
> > > Normal there should be checked for nla_put_in6_addr like other
> > > usage in net.
> > >
> > > Detected by CoverityScan, CID# 1461639
> > >
> > > Fixes: 01cacb00b35c("mptcp: add netlink-based PM")
> > > Signed-off-by: Bo YU <tsu.yubo(a)gmail.com>
> > > ---
> > > V2: Add check for nla_put_in_addr suggested by Paolo Abeni
> >
> > Thank you for addressing my feedback!
> >
> > > ---
> > > net/mptcp/pm_netlink.c | 11 +++++++----
> > > 1 file changed, 7 insertions(+), 4 deletions(-)
> > >
> > > diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
> > > index 86d61ab34c7c..0a39f0ebad76 100644
> > > --- a/net/mptcp/pm_netlink.c
> > > +++ b/net/mptcp/pm_netlink.c
> > > @@ -599,12 +599,15 @@ static int mptcp_nl_fill_addr(struct sk_buff *skb,
> > > nla_put_s32(skb, MPTCP_PM_ADDR_ATTR_IF_IDX, entry->ifindex))
> > > goto nla_put_failure;
> > >
> > > - if (addr->family == AF_INET)
> > > + if (addr->family == AF_INET &&
> > > nla_put_in_addr(skb, MPTCP_PM_ADDR_ATTR_ADDR4,
> > > - addr->addr.s_addr);
> > > + addr->addr.s_addr))
> > > + goto nla_put_failure;
> > > +
> >
> > I'm very sorry about the nit-picking, but the above is now a single
> > statement, and indentation should be adjusted accordingly:
> > 'nla_put_in_addr()' should be aligned with 'addr->family'.
> Ok, but i just want to make clear for that, do you mean:
>
>
> if (addr->family == AF_INET && nla_put_in_addr(skb,
> MPTCP_PM_ADDR_ATTR_ADDR4, addr->addr.s_addr))
>
> In fact, i was upset by checkpatch about over 80 chars warning.
> This is my originally version patch to fix it :(. If i was wrong
> to understand your means, please correct me. Thank you.
I mean:
if (addr->family == AF_INET &&
nla_put_in_addr(skb, MPTCP_PM_ADDR_ATTR_ADDR4,
addr->addr.s_addr))
note that [the first char of] 'nla_put_in_addr' is aligned with [the
first char of] 'addr->family', and 'addr->addr.s_addr' with 'skb'.
Please, nota that the same applies to nla_put_in6_addr() below.
Thanks!
Paolo
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2020-04-22 15:49 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-04-22 1:34 [PATCH V2 -next] mptcp/pm_netlink.c : add check for nla_put_in/6_addr Bo YU
2020-04-22 1:34 ` [MPTCP] " Bo YU
2020-04-22 10:12 ` Paolo Abeni
2020-04-22 10:12 ` [MPTCP] " Paolo Abeni
2020-04-22 14:56 ` Bo YU
2020-04-22 14:56 ` [MPTCP] " Bo YU
2020-04-22 15:48 ` Paolo Abeni
2020-04-22 15:48 ` [MPTCP] " Paolo Abeni
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.