* [PATCH v2 1/3] net: ethernet: bcmasp: fix possible OOB write in bcmasp_netfilt_get_all_active()
2023-09-08 6:19 [PATCH v2 0/3] Fix possible OOB write when using rule_buf Hangyu Hua
@ 2023-09-08 6:19 ` Hangyu Hua
2023-09-10 14:46 ` Simon Horman
2023-09-08 6:19 ` [PATCH v2 2/3] net: ethernet: mvpp2_main: fix possible OOB write in mvpp2_ethtool_get_rxnfc() Hangyu Hua
` (2 subsequent siblings)
3 siblings, 1 reply; 9+ messages in thread
From: Hangyu Hua @ 2023-09-08 6:19 UTC (permalink / raw)
To: justin.chen, florian.fainelli, davem, edumazet, kuba, pabeni, mw,
linux, nbd, john, sean.wang, Mark-MC.Lee, lorenzo, matthias.bgg,
angelogioacchino.delregno, maxime.chevallier, nelson.chang
Cc: bcm-kernel-feedback-list, netdev, linux-kernel, linux-arm-kernel,
linux-mediatek, Hangyu Hua
rule_locs is allocated in ethtool_get_rxnfc and the size is determined by
rule_cnt from user space. So rule_cnt needs to be check before using
rule_locs to avoid OOB writing or NULL pointer dereference.
Fixes: c5d511c49587 ("net: bcmasp: Add support for wake on net filters")
Signed-off-by: Hangyu Hua <hbh25y@gmail.com>
---
v2: use -EMSGSIZE instead of truncating the list sliently.
drivers/net/ethernet/broadcom/asp2/bcmasp.c | 9 +++++++--
drivers/net/ethernet/broadcom/asp2/bcmasp.h | 4 ++--
drivers/net/ethernet/broadcom/asp2/bcmasp_ethtool.c | 2 +-
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/asp2/bcmasp.c b/drivers/net/ethernet/broadcom/asp2/bcmasp.c
index d63d321f3e7b..e45e0ae932cc 100644
--- a/drivers/net/ethernet/broadcom/asp2/bcmasp.c
+++ b/drivers/net/ethernet/broadcom/asp2/bcmasp.c
@@ -528,13 +528,16 @@ void bcmasp_netfilt_suspend(struct bcmasp_intf *intf)
ASP_RX_FILTER_BLK_CTRL);
}
-void bcmasp_netfilt_get_all_active(struct bcmasp_intf *intf, u32 *rule_locs,
- u32 *rule_cnt)
+int bcmasp_netfilt_get_all_active(struct bcmasp_intf *intf, u32 *rule_locs,
+ u32 *rule_cnt)
{
struct bcmasp_priv *priv = intf->parent;
int j = 0, i;
for (i = 0; i < NUM_NET_FILTERS; i++) {
+ if (j == *rule_cnt)
+ return -EMSGSIZE;
+
if (!priv->net_filters[i].claimed ||
priv->net_filters[i].port != intf->port)
continue;
@@ -548,6 +551,8 @@ void bcmasp_netfilt_get_all_active(struct bcmasp_intf *intf, u32 *rule_locs,
}
*rule_cnt = j;
+
+ return 0;
}
int bcmasp_netfilt_get_active(struct bcmasp_intf *intf)
diff --git a/drivers/net/ethernet/broadcom/asp2/bcmasp.h b/drivers/net/ethernet/broadcom/asp2/bcmasp.h
index 5b512f7f5e94..ec90add6b03e 100644
--- a/drivers/net/ethernet/broadcom/asp2/bcmasp.h
+++ b/drivers/net/ethernet/broadcom/asp2/bcmasp.h
@@ -577,8 +577,8 @@ void bcmasp_netfilt_release(struct bcmasp_intf *intf,
int bcmasp_netfilt_get_active(struct bcmasp_intf *intf);
-void bcmasp_netfilt_get_all_active(struct bcmasp_intf *intf, u32 *rule_locs,
- u32 *rule_cnt);
+int bcmasp_netfilt_get_all_active(struct bcmasp_intf *intf, u32 *rule_locs,
+ u32 *rule_cnt);
void bcmasp_netfilt_suspend(struct bcmasp_intf *intf);
diff --git a/drivers/net/ethernet/broadcom/asp2/bcmasp_ethtool.c b/drivers/net/ethernet/broadcom/asp2/bcmasp_ethtool.c
index c4f1604d5ab3..ce6a3d56fb23 100644
--- a/drivers/net/ethernet/broadcom/asp2/bcmasp_ethtool.c
+++ b/drivers/net/ethernet/broadcom/asp2/bcmasp_ethtool.c
@@ -335,7 +335,7 @@ static int bcmasp_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd,
err = bcmasp_flow_get(intf, cmd);
break;
case ETHTOOL_GRXCLSRLALL:
- bcmasp_netfilt_get_all_active(intf, rule_locs, &cmd->rule_cnt);
+ err = bcmasp_netfilt_get_all_active(intf, rule_locs, &cmd->rule_cnt);
cmd->data = NUM_NET_FILTERS;
break;
default:
--
2.34.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH v2 1/3] net: ethernet: bcmasp: fix possible OOB write in bcmasp_netfilt_get_all_active()
2023-09-08 6:19 ` [PATCH v2 1/3] net: ethernet: bcmasp: fix possible OOB write in bcmasp_netfilt_get_all_active() Hangyu Hua
@ 2023-09-10 14:46 ` Simon Horman
0 siblings, 0 replies; 9+ messages in thread
From: Simon Horman @ 2023-09-10 14:46 UTC (permalink / raw)
To: Hangyu Hua
Cc: justin.chen, florian.fainelli, davem, edumazet, kuba, pabeni, mw,
linux, nbd, john, sean.wang, Mark-MC.Lee, lorenzo, matthias.bgg,
angelogioacchino.delregno, maxime.chevallier, nelson.chang,
bcm-kernel-feedback-list, netdev, linux-kernel, linux-arm-kernel,
linux-mediatek
On Fri, Sep 08, 2023 at 02:19:48PM +0800, Hangyu Hua wrote:
> rule_locs is allocated in ethtool_get_rxnfc and the size is determined by
> rule_cnt from user space. So rule_cnt needs to be check before using
> rule_locs to avoid OOB writing or NULL pointer dereference.
>
> Fixes: c5d511c49587 ("net: bcmasp: Add support for wake on net filters")
> Signed-off-by: Hangyu Hua <hbh25y@gmail.com>
Reviewed-by: Simon Horman <horms@kernel.org>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v2 2/3] net: ethernet: mvpp2_main: fix possible OOB write in mvpp2_ethtool_get_rxnfc()
2023-09-08 6:19 [PATCH v2 0/3] Fix possible OOB write when using rule_buf Hangyu Hua
2023-09-08 6:19 ` [PATCH v2 1/3] net: ethernet: bcmasp: fix possible OOB write in bcmasp_netfilt_get_all_active() Hangyu Hua
@ 2023-09-08 6:19 ` Hangyu Hua
2023-09-08 7:11 ` Marcin Wojtas
2023-09-08 8:39 ` Russell King (Oracle)
2023-09-08 6:19 ` [PATCH v2 3/3] net: ethernet: mtk_eth_soc: fix possible NULL pointer dereference in mtk_hwlro_get_fdir_all() Hangyu Hua
2023-09-11 7:30 ` [PATCH v2 0/3] Fix possible OOB write when using rule_buf patchwork-bot+netdevbpf
3 siblings, 2 replies; 9+ messages in thread
From: Hangyu Hua @ 2023-09-08 6:19 UTC (permalink / raw)
To: justin.chen, florian.fainelli, davem, edumazet, kuba, pabeni, mw,
linux, nbd, john, sean.wang, Mark-MC.Lee, lorenzo, matthias.bgg,
angelogioacchino.delregno, maxime.chevallier, nelson.chang
Cc: bcm-kernel-feedback-list, netdev, linux-kernel, linux-arm-kernel,
linux-mediatek, Hangyu Hua
rules is allocated in ethtool_get_rxnfc and the size is determined by
rule_cnt from user space. So rule_cnt needs to be check before using
rules to avoid OOB writing or NULL pointer dereference.
Fixes: 90b509b39ac9 ("net: mvpp2: cls: Add Classification offload support")
Signed-off-by: Hangyu Hua <hbh25y@gmail.com>
---
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
index eb74ccddb440..21c3f9b015c8 100644
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
@@ -5586,6 +5586,11 @@ static int mvpp2_ethtool_get_rxnfc(struct net_device *dev,
break;
case ETHTOOL_GRXCLSRLALL:
for (i = 0; i < MVPP2_N_RFS_ENTRIES_PER_FLOW; i++) {
+ if (loc == info->rule_cnt) {
+ ret = -EMSGSIZE;
+ break;
+ }
+
if (port->rfs_rules[i])
rules[loc++] = i;
}
--
2.34.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH v2 2/3] net: ethernet: mvpp2_main: fix possible OOB write in mvpp2_ethtool_get_rxnfc()
2023-09-08 6:19 ` [PATCH v2 2/3] net: ethernet: mvpp2_main: fix possible OOB write in mvpp2_ethtool_get_rxnfc() Hangyu Hua
@ 2023-09-08 7:11 ` Marcin Wojtas
2023-09-08 8:39 ` Russell King (Oracle)
1 sibling, 0 replies; 9+ messages in thread
From: Marcin Wojtas @ 2023-09-08 7:11 UTC (permalink / raw)
To: Hangyu Hua
Cc: justin.chen, florian.fainelli, davem, edumazet, kuba, pabeni,
linux, nbd, john, sean.wang, Mark-MC.Lee, lorenzo, matthias.bgg,
angelogioacchino.delregno, maxime.chevallier, nelson.chang,
bcm-kernel-feedback-list, netdev, linux-kernel, linux-arm-kernel,
linux-mediatek
pt., 8 wrz 2023 o 08:21 Hangyu Hua <hbh25y@gmail.com> napisał(a):
>
> rules is allocated in ethtool_get_rxnfc and the size is determined by
> rule_cnt from user space. So rule_cnt needs to be check before using
> rules to avoid OOB writing or NULL pointer dereference.
>
> Fixes: 90b509b39ac9 ("net: mvpp2: cls: Add Classification offload support")
> Signed-off-by: Hangyu Hua <hbh25y@gmail.com>
> ---
> drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
> index eb74ccddb440..21c3f9b015c8 100644
> --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
> +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
> @@ -5586,6 +5586,11 @@ static int mvpp2_ethtool_get_rxnfc(struct net_device *dev,
> break;
> case ETHTOOL_GRXCLSRLALL:
> for (i = 0; i < MVPP2_N_RFS_ENTRIES_PER_FLOW; i++) {
> + if (loc == info->rule_cnt) {
> + ret = -EMSGSIZE;
> + break;
> + }
> +
> if (port->rfs_rules[i])
> rules[loc++] = i;
> }
Reviewed-by: Marcin Wojtas <mw@semihalf.com>
Thanks,
Marcin
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH v2 2/3] net: ethernet: mvpp2_main: fix possible OOB write in mvpp2_ethtool_get_rxnfc()
2023-09-08 6:19 ` [PATCH v2 2/3] net: ethernet: mvpp2_main: fix possible OOB write in mvpp2_ethtool_get_rxnfc() Hangyu Hua
2023-09-08 7:11 ` Marcin Wojtas
@ 2023-09-08 8:39 ` Russell King (Oracle)
1 sibling, 0 replies; 9+ messages in thread
From: Russell King (Oracle) @ 2023-09-08 8:39 UTC (permalink / raw)
To: Hangyu Hua
Cc: justin.chen, florian.fainelli, davem, edumazet, kuba, pabeni, mw,
nbd, john, sean.wang, Mark-MC.Lee, lorenzo, matthias.bgg,
angelogioacchino.delregno, maxime.chevallier, nelson.chang,
bcm-kernel-feedback-list, netdev, linux-kernel, linux-arm-kernel,
linux-mediatek
On Fri, Sep 08, 2023 at 02:19:49PM +0800, Hangyu Hua wrote:
> rules is allocated in ethtool_get_rxnfc and the size is determined by
> rule_cnt from user space. So rule_cnt needs to be check before using
> rules to avoid OOB writing or NULL pointer dereference.
>
> Fixes: 90b509b39ac9 ("net: mvpp2: cls: Add Classification offload support")
> Signed-off-by: Hangyu Hua <hbh25y@gmail.com>
Reviewed-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Thanks!
--
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v2 3/3] net: ethernet: mtk_eth_soc: fix possible NULL pointer dereference in mtk_hwlro_get_fdir_all()
2023-09-08 6:19 [PATCH v2 0/3] Fix possible OOB write when using rule_buf Hangyu Hua
2023-09-08 6:19 ` [PATCH v2 1/3] net: ethernet: bcmasp: fix possible OOB write in bcmasp_netfilt_get_all_active() Hangyu Hua
2023-09-08 6:19 ` [PATCH v2 2/3] net: ethernet: mvpp2_main: fix possible OOB write in mvpp2_ethtool_get_rxnfc() Hangyu Hua
@ 2023-09-08 6:19 ` Hangyu Hua
2023-09-10 14:47 ` Simon Horman
2023-09-11 7:30 ` [PATCH v2 0/3] Fix possible OOB write when using rule_buf patchwork-bot+netdevbpf
3 siblings, 1 reply; 9+ messages in thread
From: Hangyu Hua @ 2023-09-08 6:19 UTC (permalink / raw)
To: justin.chen, florian.fainelli, davem, edumazet, kuba, pabeni, mw,
linux, nbd, john, sean.wang, Mark-MC.Lee, lorenzo, matthias.bgg,
angelogioacchino.delregno, maxime.chevallier, nelson.chang
Cc: bcm-kernel-feedback-list, netdev, linux-kernel, linux-arm-kernel,
linux-mediatek, Hangyu Hua
rule_locs is allocated in ethtool_get_rxnfc and the size is determined by
rule_cnt from user space. So rule_cnt needs to be check before using
rule_locs to avoid NULL pointer dereference.
Fixes: 7aab747e5563 ("net: ethernet: mediatek: add ethtool functions to configure RX flows of HW LRO")
Signed-off-by: Hangyu Hua <hbh25y@gmail.com>
---
v2: drop the brackets.
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
index 6ad42e3b488f..2372ce8c2580 100644
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -2994,6 +2994,9 @@ static int mtk_hwlro_get_fdir_all(struct net_device *dev,
int i;
for (i = 0; i < MTK_MAX_LRO_IP_CNT; i++) {
+ if (cnt == cmd->rule_cnt)
+ return -EMSGSIZE;
+
if (mac->hwlro_ip[i]) {
rule_locs[cnt] = i;
cnt++;
--
2.34.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH v2 3/3] net: ethernet: mtk_eth_soc: fix possible NULL pointer dereference in mtk_hwlro_get_fdir_all()
2023-09-08 6:19 ` [PATCH v2 3/3] net: ethernet: mtk_eth_soc: fix possible NULL pointer dereference in mtk_hwlro_get_fdir_all() Hangyu Hua
@ 2023-09-10 14:47 ` Simon Horman
0 siblings, 0 replies; 9+ messages in thread
From: Simon Horman @ 2023-09-10 14:47 UTC (permalink / raw)
To: Hangyu Hua
Cc: justin.chen, florian.fainelli, davem, edumazet, kuba, pabeni, mw,
linux, nbd, john, sean.wang, Mark-MC.Lee, lorenzo, matthias.bgg,
angelogioacchino.delregno, maxime.chevallier, nelson.chang,
bcm-kernel-feedback-list, netdev, linux-kernel, linux-arm-kernel,
linux-mediatek
On Fri, Sep 08, 2023 at 02:19:50PM +0800, Hangyu Hua wrote:
> rule_locs is allocated in ethtool_get_rxnfc and the size is determined by
> rule_cnt from user space. So rule_cnt needs to be check before using
> rule_locs to avoid NULL pointer dereference.
>
> Fixes: 7aab747e5563 ("net: ethernet: mediatek: add ethtool functions to configure RX flows of HW LRO")
> Signed-off-by: Hangyu Hua <hbh25y@gmail.com>
Reviewed-by: Simon Horman <horms@kernel.org>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2 0/3] Fix possible OOB write when using rule_buf
2023-09-08 6:19 [PATCH v2 0/3] Fix possible OOB write when using rule_buf Hangyu Hua
` (2 preceding siblings ...)
2023-09-08 6:19 ` [PATCH v2 3/3] net: ethernet: mtk_eth_soc: fix possible NULL pointer dereference in mtk_hwlro_get_fdir_all() Hangyu Hua
@ 2023-09-11 7:30 ` patchwork-bot+netdevbpf
3 siblings, 0 replies; 9+ messages in thread
From: patchwork-bot+netdevbpf @ 2023-09-11 7:30 UTC (permalink / raw)
To: Hangyu Hua
Cc: justin.chen, florian.fainelli, davem, edumazet, kuba, pabeni, mw,
linux, nbd, john, sean.wang, Mark-MC.Lee, lorenzo, matthias.bgg,
angelogioacchino.delregno, maxime.chevallier, nelson.chang,
bcm-kernel-feedback-list, netdev, linux-kernel, linux-arm-kernel,
linux-mediatek
Hello:
This series was applied to netdev/net.git (main)
by David S. Miller <davem@davemloft.net>:
On Fri, 8 Sep 2023 14:19:47 +0800 you wrote:
> ADD bounds checks in bcmasp_netfilt_get_all_active and
> mvpp2_ethtool_get_rxnfc and mtk_hwlro_get_fdir_all when
> using rule_buf from ethtool_get_rxnfc.
>
> v2:
> [PATCH v2 1/3]: use -EMSGSIZE instead of truncating the list sliently.
> [PATCH v2 3/3]: drop the brackets.
>
> [...]
Here is the summary with links:
- [v2,1/3] net: ethernet: bcmasp: fix possible OOB write in bcmasp_netfilt_get_all_active()
https://git.kernel.org/netdev/net/c/9b90aca97f6d
- [v2,2/3] net: ethernet: mvpp2_main: fix possible OOB write in mvpp2_ethtool_get_rxnfc()
https://git.kernel.org/netdev/net/c/51fe0a470543
- [v2,3/3] net: ethernet: mtk_eth_soc: fix possible NULL pointer dereference in mtk_hwlro_get_fdir_all()
https://git.kernel.org/netdev/net/c/e4c79810755f
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 9+ messages in thread