Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp1019955yba; Thu, 4 Apr 2019 02:34:39 -0700 (PDT) X-Google-Smtp-Source: APXvYqzJ8op7R9XAba+UtsCRUV6Uo/hkCuasZbIYC2GgUcJ4iXgntz3zvzyD5QHqXlbX3G3ZTn6V X-Received: by 2002:a17:902:8d89:: with SMTP id v9mr5323085plo.230.1554370478928; Thu, 04 Apr 2019 02:34:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554370478; cv=none; d=google.com; s=arc-20160816; b=JJN9CaEF1DyXFTngsQVWBK5//1bfqYCQB/1mSXDhx2wHRxESi30mZmvH4F1OlaGnAs FCJlMhPl6R7R4JSE6Srclm2iVGV/RVQ00mVBqf6kuAEYHPCcr36Z4nW6V/vrmU+JmSnp BjXtoTmkacrUHkJnAJ4ntQLPKH90HV3LXjvGGoJt066GYsxZgy2y9kTE64OvTtKYHcLj 4Ek3rUQcHA/EDFcrMHCIe3Lb3WsibUCdXtm3ZwFWj38Iy/bqPuhyr44em6xyavNI8uMe cWE7MbTrLMP1sy/JgGZ/o8VJKUxSSDTgnACiKx8dqXSO3nH+Se3Vixee2ZCF6HBiuU+u WrUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=uEtUWRqYHMv20Q3mofGlenxCcX7Pru6T63xp6219jz0=; b=geIEEN2Tmq3ACBGKf8IaNMU2TZCJPZz9tvMGBO9LQjYutKCD3Ceg9dD4sBV2prSwkd 9RIyQIfjqGpdN5NLHONgEahu9xgGWt5imYGLGHKmT3E/4ANMqWkBXW0b3tz5MV8u70XU S/XsIbXi+To4GvIvQNzCAXtMxlgaNQTpoPpiytU/xcEABecL0YBQykPSlYaCKgo73gTx IUNh0YlPHVGdmEfDEh3B13s3r1aGp0ioym3JH+eyblj91bIATM8HR3qp5rzWfC54YbFT X+pRqP3Fg8E9VHjETI9g5wutfaWBSswO/ctwLsltbj11PUO4ncAScxvOBD0/i1fivps6 vEuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="CE/dKzqI"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l62si7953518pgd.168.2019.04.04.02.34.23; Thu, 04 Apr 2019 02:34:38 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="CE/dKzqI"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732748AbfDDJJB (ORCPT + 99 others); Thu, 4 Apr 2019 05:09:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:48060 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732735AbfDDJI5 (ORCPT ); Thu, 4 Apr 2019 05:08:57 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B41B621741; Thu, 4 Apr 2019 09:08:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554368936; bh=Hj34u3/0pv314SOZkFWb1szz80gnqtK8v134ZUy9+3g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CE/dKzqIzIn1pZk5q6JfKZCYFO/ye7TbHLNzX5K4nIF1IhMGqsiIVEeV/gKtF6kjo h6VncDFqGonWzkLNR6/5qId+0uX8kxd+e38Qx47Ugb84x9wP+LPOLyVLvUWIVUaoc3 n0dRZ3Toabo7RouvxQNNYJpPJMZeu55ooQ7DPTRs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Or Gerlitz , Maria Pasechnik , Tariq Toukan , Eran Ben Elisha , Saeed Mahameed , Sasha Levin Subject: [PATCH 5.0 010/246] net/mlx5e: Fix access to non-existing receive queue Date: Thu, 4 Apr 2019 10:45:10 +0200 Message-Id: <20190404084619.571911772@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190404084619.236418459@linuxfoundation.org> References: <20190404084619.236418459@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 5.0-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit c475e11e82d16133304321bae285c5c1d4cfc856 ] In case number of channels is changed while interface is down, RSS indirection table is mistakenly not modified accordingly, causing access to out-of-range non-existing object. Fix by updating the RSS indireciton table also in the early return flow of interface down. Fixes: fb35c534b788 ("net/mlx5e: Fix NULL pointer derefernce in set channels error flow") Fixes: bbeb53b8b2c9 ("net/mlx5e: Move RSS params to a dedicated struct") Reported-by: Or Gerlitz Tested-by: Maria Pasechnik Signed-off-by: Tariq Toukan Reviewed-by: Eran Ben Elisha Signed-off-by: Saeed Mahameed Signed-off-by: Sasha Levin --- drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c index 47233b9a4f81..e6099f51d25f 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c @@ -357,6 +357,9 @@ int mlx5e_ethtool_set_channels(struct mlx5e_priv *priv, if (!test_bit(MLX5E_STATE_OPENED, &priv->state)) { priv->channels.params = new_channels.params; + if (!netif_is_rxfh_configured(priv->netdev)) + mlx5e_build_default_indir_rqt(priv->rss_params.indirection_rqt, + MLX5E_INDIR_RQT_SIZE, count); goto out; } -- 2.19.1