From: Leon Romanovsky <leon@kernel.org>
To: Lin Ma <linma@zju.edu.cn>
Cc: hawk@kernel.org, daniel@iogearbox.net,
intel-wired-lan@lists.osuosl.org, richardcochran@gmail.com,
john.fastabend@gmail.com, jesse.brandeburg@intel.com,
ast@kernel.org, edumazet@google.com, anthony.l.nguyen@intel.com,
netdev@vger.kernel.org, kuba@kernel.org, pabeni@redhat.com,
davem@davemloft.net, linux-kernel@vger.kernel.org
Subject: Re: [Intel-wired-lan] [PATCH v1] i40e: Add length check for IFLA_AF_SPEC parsing
Date: Mon, 24 Jul 2023 20:44:35 +0300 [thread overview]
Message-ID: <20230724174435.GA11388@unreal> (raw)
In-Reply-To: <20230723075042.3709043-1-linma@zju.edu.cn>
On Sun, Jul 23, 2023 at 03:50:42PM +0800, Lin Ma wrote:
> The nla_for_each_nested parsing in function i40e_ndo_bridge_setlink()
> does not check the length of the attribute. This can lead to an
> out-of-attribute read and allow a malformed nlattr (e.g., length 0) to
> be viewed as a 2 byte integer.
>
> This patch adds the check based on nla_len() just as other code does,
> see how bnxt_bridge_setlink (drivers/net/ethernet/broadcom/bnxt/bnxt.c)
> parses IFLA_AF_SPEC: type checking plus length checking.
>
> Fixes: 51616018dd1b ("i40e: Add support for getlink, setlink ndo ops")
> Signed-off-by: Lin Ma <linma@zju.edu.cn>
> ---
> drivers/net/ethernet/intel/i40e/i40e_main.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
> index 29ad1797adce..6363357bdeeb 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e_main.c
> +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
> @@ -13186,6 +13186,9 @@ static int i40e_ndo_bridge_setlink(struct net_device *dev,
> if (nla_type(attr) != IFLA_BRIDGE_MODE)
> continue;
>
> + if (nla_len(attr) < sizeof(mode))
> + return -EINVAL;
> +
I see that you added this hunk to all users of nla_for_each_nested(), it
will be great to make that iterator to skip such empty attributes.
However, i don't know nettlink good enough to say if your change is
valid in first place.
Thanks
> mode = nla_get_u16(attr);
> if ((mode != BRIDGE_MODE_VEPA) &&
> (mode != BRIDGE_MODE_VEB))
> --
> 2.17.1
>
>
_______________________________________________
Intel-wired-lan mailing list
Intel-wired-lan@osuosl.org
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
WARNING: multiple messages have this Message-ID (diff)
From: Leon Romanovsky <leon@kernel.org>
To: Lin Ma <linma@zju.edu.cn>
Cc: jesse.brandeburg@intel.com, anthony.l.nguyen@intel.com,
davem@davemloft.net, edumazet@google.com, kuba@kernel.org,
pabeni@redhat.com, richardcochran@gmail.com, ast@kernel.org,
daniel@iogearbox.net, hawk@kernel.org, john.fastabend@gmail.com,
intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v1] i40e: Add length check for IFLA_AF_SPEC parsing
Date: Mon, 24 Jul 2023 20:44:35 +0300 [thread overview]
Message-ID: <20230724174435.GA11388@unreal> (raw)
In-Reply-To: <20230723075042.3709043-1-linma@zju.edu.cn>
On Sun, Jul 23, 2023 at 03:50:42PM +0800, Lin Ma wrote:
> The nla_for_each_nested parsing in function i40e_ndo_bridge_setlink()
> does not check the length of the attribute. This can lead to an
> out-of-attribute read and allow a malformed nlattr (e.g., length 0) to
> be viewed as a 2 byte integer.
>
> This patch adds the check based on nla_len() just as other code does,
> see how bnxt_bridge_setlink (drivers/net/ethernet/broadcom/bnxt/bnxt.c)
> parses IFLA_AF_SPEC: type checking plus length checking.
>
> Fixes: 51616018dd1b ("i40e: Add support for getlink, setlink ndo ops")
> Signed-off-by: Lin Ma <linma@zju.edu.cn>
> ---
> drivers/net/ethernet/intel/i40e/i40e_main.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
> index 29ad1797adce..6363357bdeeb 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e_main.c
> +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
> @@ -13186,6 +13186,9 @@ static int i40e_ndo_bridge_setlink(struct net_device *dev,
> if (nla_type(attr) != IFLA_BRIDGE_MODE)
> continue;
>
> + if (nla_len(attr) < sizeof(mode))
> + return -EINVAL;
> +
I see that you added this hunk to all users of nla_for_each_nested(), it
will be great to make that iterator to skip such empty attributes.
However, i don't know nettlink good enough to say if your change is
valid in first place.
Thanks
> mode = nla_get_u16(attr);
> if ((mode != BRIDGE_MODE_VEPA) &&
> (mode != BRIDGE_MODE_VEB))
> --
> 2.17.1
>
>
next prev parent reply other threads:[~2023-07-24 17:50 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-23 7:50 [Intel-wired-lan] [PATCH v1] i40e: Add length check for IFLA_AF_SPEC parsing Lin Ma
2023-07-23 7:50 ` Lin Ma
2023-07-24 17:44 ` Leon Romanovsky [this message]
2023-07-24 17:44 ` Leon Romanovsky
2023-07-24 21:21 ` [Intel-wired-lan] " Jakub Kicinski
2023-07-24 21:21 ` Jakub Kicinski
2023-07-25 0:00 ` [Intel-wired-lan] " Lin Ma
2023-07-25 0:00 ` Lin Ma
2023-07-25 5:40 ` [Intel-wired-lan] " Leon Romanovsky
2023-07-25 5:40 ` Leon Romanovsky
2023-07-25 16:53 ` [Intel-wired-lan] " Jakub Kicinski
2023-07-25 16:53 ` Jakub Kicinski
2023-07-25 18:36 ` [Intel-wired-lan] " Leon Romanovsky
2023-07-25 18:36 ` Leon Romanovsky
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=20230724174435.GA11388@unreal \
--to=leon@kernel.org \
--cc=anthony.l.nguyen@intel.com \
--cc=ast@kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=hawk@kernel.org \
--cc=intel-wired-lan@lists.osuosl.org \
--cc=jesse.brandeburg@intel.com \
--cc=john.fastabend@gmail.com \
--cc=kuba@kernel.org \
--cc=linma@zju.edu.cn \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=richardcochran@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 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.