lkml.org 
[lkml]   [2018]   [Mar]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.4 018/167] net/mlx4_en: Avoid adding steering rules with invalid ring
    Date
    From: Talat Batheesh <talatb@mellanox.com>

    [ Upstream commit 89c557687a32c294e9d25670a96e9287c09f2d5f ]

    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@mellanox.com>
    Signed-off-by: Tariq Toukan <tariqt@mellanox.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    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 ddb5541882f5..d9bb185f7320 100644
    --- a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
    +++ b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
    @@ -1513,6 +1513,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",
    --
    2.14.1
    \
     
     \ /
      Last update: 2018-03-19 18:34    [W:4.062 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site