From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-3397032-1523481791-5-1770410445457577006 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, MAILING_LIST_MULTI -1, ME_NOAUTH 0.01, RCVD_IN_DNSWL_HI -5, LANGUAGES ensvda, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='org', MailFrom='org' X-Spam-charsets: plain='UTF-8' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=fm2; t= 1523481790; b=vWsX0pFMyxkVuZxeKneyf2cDh9M+hDi286okJdV8quY1DEe1Af JLfSEtGKLcWPj9sbHnyz+yiKyLpANjdZtz8y1qlom/LwOopTjKPv3Y2WSrvUzEc8 BgkwAlnD6PIy+4pKk05mYGVSGNM+YbOU8QzRwiueuH53BTKwTU8sgWysFyLKVap+ Cou01kSc+A/4TPvzV/xklNk6iVMgLfnCAQT8NarHn8mwRtvgwJrptRwSYMxGO9vO pmUYgUP10cdDtnnw+NlQGtIrz2KH1lz9lOAmEOCMsqNV7X9oYnbo+q2dDuK9QdUa 14vP5KzfO08C0UdZm/bK4VrjrWrpDk9RoTxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type:sender :list-id; s=fm2; t=1523481790; bh=M35oKFUT+Ig3m+nSt/2mGtwhly/0ge PMsnW0odtSWTg=; b=XjLjvW5XNaEunbz+5GjtivjLI7WGkq5ZSJGLPerOiywyPA 6qVSUYDM90uv4DxrhDM3bDOOootmz5yXXNIiYVRI92HfP9iVUmjLmQXo8HffwjqP FjjAdl2JXLbtriXBFIrHkyc6AURlqwzm16nKcyF8lieLWR0tcLSSXTY9CCaAb1RO RP7FHc7XEnQ+p2o2eegAL2ciuadPTVa0Aa61nGUMExrotFtne8Kf1hLCbaZgIbYa /zc9rqkdguIo5NepER1XnMKkJoJSBNpvnx/1pLE0gWKoQuBju25+B69+z5Y65BDt np+BWbJ+1hAKQ3Xp/HvLstLZgyDkzEkHICdFQvWA== ARC-Authentication-Results: i=1; mx1.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 Authentication-Results: mx1.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 X-ME-VSCategory: clean X-CM-Envelope: MS4wfNszcnvBOGCGK0QYJ9B00HecuCrDMKY6bX8pJK3V6FBAAoB6k9y9mHGOjK4d05fLNzvLY46n0Pta8nw3sOhjFOgZ0f7Ks8YWng/wXgJ6dtu062E986Dn 1ckYMjXN+0aGJ4emMX5PS9jkAdwoTtK3aAQEsTIEjcu2rWiJJ2FZlKycP1iXItuICq5jAhBs99gvoSFk7lXa61p5S26VhONdH2BuhtI6JZ+zTiFkY8VB6Koa X-CM-Analysis: v=2.3 cv=WaUilXpX c=1 sm=1 tr=0 a=UK1r566ZdBxH71SXbqIOeA==:117 a=UK1r566ZdBxH71SXbqIOeA==:17 a=IkcTkHD0fZMA:10 a=Kd1tUaAdevIA:10 a=CbDCq_QkAAAA:8 a=J1Y8HTJGAAAA:8 a=yMhMjlubAAAA:8 a=ag1SF4gXAAAA:8 a=T0oSdNId3tmA6LNMnrQA:9 a=6hYkrw0bbtUdOXsA:21 a=sv4KXNMTVxxuvHMY:21 a=QEXdDO2ut3YA:10 a=1qrBK16LubpBFNPVNq2M:22 a=y1Q9-5lHfBjTkpIzbSAN:22 a=Yupwre4RP9_Eg_Bd0iYG:22 X-ME-CMScore: 0 X-ME-CMCategory: none Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754234AbeDKSiy (ORCPT ); Wed, 11 Apr 2018 14:38:54 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:55550 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753069AbeDKSiw (ORCPT ); Wed, 11 Apr 2018 14:38:52 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Talat Batheesh , Tariq Toukan , "David S. Miller" , Sasha Levin Subject: [PATCH 3.18 011/121] net/mlx4_en: Avoid adding steering rules with invalid ring Date: Wed, 11 Apr 2018 20:35:14 +0200 Message-Id: <20180411183456.915719619@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180411183456.195010921@linuxfoundation.org> References: <20180411183456.195010921@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Talat Batheesh [ 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 Signed-off-by: Tariq Toukan Signed-off-by: David S. Miller Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- 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 @@ -946,6 +946,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",