From: Paolo Abeni <pabeni@redhat.com>
To: Bo YU <tsu.yubo@gmail.com>,
matthieu.baerts@tessares.net, davem@davemloft.net,
kuba@kernel.org, mathew.j.martineau@linux.intel.com
Cc: netdev@vger.kernel.org, mptcp@lists.01.org
Subject: Re: [PATCH V3 -next] mptcp/pm_netlink.c : add check for nla_put_in/6_addr
Date: Thu, 23 Apr 2020 10:34:54 +0200 [thread overview]
Message-ID: <8546038508824f0a440f40bb9eef7ede61d223bb.camel@redhat.com> (raw)
In-Reply-To: <20200423020957.g5ovpymbbp4nykbr@debian.debian-2>
On Thu, 2020-04-23 at 10:10 +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>
> ---
> V3: fix code style, thanks for Paolo
>
> V2: Add check for nla_put_in_addr suggested by Paolo Abeni
> ---
> net/mptcp/pm_netlink.c | 12 +++++++-----
> 1 file changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
> index 86d61ab34c7c..b78edf237ba0 100644
> --- a/net/mptcp/pm_netlink.c
> +++ b/net/mptcp/pm_netlink.c
> @@ -599,12 +599,14 @@ 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)
> - nla_put_in_addr(skb, MPTCP_PM_ADDR_ATTR_ADDR4,
> - addr->addr.s_addr);
> + if (addr->family == AF_INET &&
> + nla_put_in_addr(skb, MPTCP_PM_ADDR_ATTR_ADDR4,
> + 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
Thanks for addressing my feedback!
Acked-by: Paolo Abeni <pabeni@redhat.com>
next prev parent reply other threads:[~2020-04-23 8:35 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-23 2:10 [PATCH V3 -next] mptcp/pm_netlink.c : add check for nla_put_in/6_addr Bo YU
2020-04-23 8:34 ` Paolo Abeni [this message]
2020-04-23 22:38 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8546038508824f0a440f40bb9eef7ede61d223bb.camel@redhat.com \
--to=pabeni@redhat.com \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=mathew.j.martineau@linux.intel.com \
--cc=matthieu.baerts@tessares.net \
--cc=mptcp@lists.01.org \
--cc=netdev@vger.kernel.org \
--cc=tsu.yubo@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox