Re: [PATCH 3.16 124/134] net/mlx4_en: Avoid adding steering rules with invalid ring

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 




On 18/08/2017 4:13 PM, Ben Hutchings wrote:
3.16.47-rc1 review patch.  If anyone has any objections, please let me know.
Please notice that there's a fix for this patch, here:

6dc06c08bef1 net/mlx4: Fix the check in attaching steering rules


------------------

From: Talat Batheesh <talatb@xxxxxxxxxxxx>

commit 89c557687a32c294e9d25670a96e9287c09f2d5f upstream.

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 <talatb@xxxxxxxxxxxx>
Signed-off-by: Tariq Toukan <tariqt@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Ben Hutchings <ben@xxxxxxxxxxxxxxx>
---
  drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 5 +++++
  1 file changed, 5 insertions(+)

--- a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
@@ -930,6 +930,11 @@ static int mlx4_en_flow_replace(struct n
  		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",





[Index of Archives]     [Linux Kernel]     [Kernel Development Newbies]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Hiking]     [Linux Kernel]     [Linux SCSI]