Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89c55768 authored by Talat Batheesh's avatar Talat Batheesh Committed by David S. Miller
Browse files

net/mlx4_en: Avoid adding steering rules with invalid ring 



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

Fixes: 82067281 ('net/mlx4_en: Manage flow steering rules with ethtool')
Signed-off-by: default avatarTalat Batheesh <talatb@mellanox.com>
Signed-off-by: default avatarTariq Toukan <tariqt@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 505a9249

drivers/net/ethernet/mellanox/mlx4/en_ethtool.c

+5 −0
Original line number Original line Diff line number Diff line
@@ -1562,6 +1562,11 @@ static int mlx4_en_flow_replace(struct net_device *dev, 
		qpn = priv->drop_qp.qpn;

		qpn = priv->drop_qp.qpn;

	else if (cmd->fs.ring_cookie & EN_ETHTOOL_QP_ATTACH) {

	else if (cmd->fs.ring_cookie & EN_ETHTOOL_QP_ATTACH) {

		qpn = cmd->fs.ring_cookie & (EN_ETHTOOL_QP_ATTACH - 1);

		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 {

	} else {

		if (cmd->fs.ring_cookie >= priv->rx_ring_num) {

		if (cmd->fs.ring_cookie >= priv->rx_ring_num) {

			en_warn(priv, "rxnfc: RX ring (%llu) doesn't exist\n",

			en_warn(priv, "rxnfc: RX ring (%llu) doesn't exist\n",