Re: [PATCH net 2/3] net/mlx4_en: Avoid adding steering rules with invalid ring

[Or Gerlitz]

On Tue, May 9, 2017 at 2:45 PM, Tariq Toukan  wrote:
> From: Talat Batheesh 
>
> Inserting steering rules with illegal ring is an invalid operation, block it.

Hi Dave,

I realized today that the patch introduced a regression, Tariq will
see if to revert it as a whole or fix the regression.

Just wanted to drop you a note and to make sure you don't further
carry it to -stable,

xxit happens :(

Or.

[PATCH net 2/3] net/mlx4_en: Avoid adding steering rules with invalid ring

[Tariq Toukan]

From: Talat Batheesh 

Inserting steering rules with illegal ring is an invalid operation,
block it.

Fixes: 820672812f82 ('net/mlx4_en: Manage flow steering rules with ethtool')
Signed-off-by: Talat Batheesh 
Signed-off-by: Tariq Toukan 
---
 drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 5 +
 1 file changed, 5 insertions(+)

diff --git a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c 
b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
index ffbcb27c05e5..ae5fdc2df654 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
@@ -1562,6 +1562,11 @@ static int mlx4_en_flow_replace(struct net_device *dev,
qpn = priv->drop_qp.qpn;
else if (cmd->fs.ring_cookie & EN_ETHTOOL_QP_ATTACH) {
qpn = cmd->fs.ring_cookie & (EN_ETHTOOL_QP_ATTACH - 1);
+   if (qpn < priv->rss_map.base_qpn ||
+   qpn >= priv->rss_map.base_qpn + priv->rx_ring_num) {
+   en_warn(priv, "rxnfc: QP (0x%x) doesn't exist\n", qpn);
+   return -EINVAL;
+   }
} else {
if (cmd->fs.ring_cookie >= priv->rx_ring_num) {
en_warn(priv, "rxnfc: RX ring (%llu) doesn't exist\n",
-- 
1.8.3.1