From patchwork Fri May 8 12:33:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 226256 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E23C6C38A2A for ; Fri, 8 May 2020 12:44:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B72702496A for ; Fri, 8 May 2020 12:44:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588941892; bh=4prF8DDv8Jnj9rAclIfEACuTg4aF5Tl7SY7vnNaeCGM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=nAZqnSEFs77kJlH3lwU3fiLSUFmqO4B797e9MP4/JJMj17/5E2XhDtsFyl/ttz3SH iNPCoXAXyPdyhZUvRbmGjnv0rUdYFGc03SpL2mOvd/s/RkZvzT7WEldZV1J/o11WQT KETTYqhSQRnYo06xCfnPgOhiC2quZuWIh0Xil64c= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729224AbgEHMov (ORCPT ); Fri, 8 May 2020 08:44:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:43626 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727832AbgEHMou (ORCPT ); Fri, 8 May 2020 08:44:50 -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 7031C208D6; Fri, 8 May 2020 12:44:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588941889; bh=4prF8DDv8Jnj9rAclIfEACuTg4aF5Tl7SY7vnNaeCGM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=drHXDaqyAcojqEkHXiBd4U/9DlURj+RjF7cpfCcL+pfyTKsUEQQ+UgO8F4rnFUCyB Z2hjLtHWnwDwaYrrXpkajIvTckI9r1lzIRF+sHusKsu7zSLHESCl8yL0M2WUaschvt tZoCc4UIknmlv62KeaT3LcLxg3oJT0/sMKbYdcUU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tariq Toukan , Dan Carpenter , "David S. Miller" Subject: [PATCH 4.4 213/312] net/mlx4_core: Fix access to uninitialized index Date: Fri, 8 May 2020 14:33:24 +0200 Message-Id: <20200508123139.404678970@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200508123124.574959822@linuxfoundation.org> References: <20200508123124.574959822@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Tariq Toukan commit 2bb07e155bb3e0c722c806723f737cf8020961ef upstream. Prevent using uninitialized or negative index when handling steering entries. Fixes: b12d93d63c32 ('mlx4: Add support for promiscuous mode in the new steering model.') Signed-off-by: Tariq Toukan Reported-by: Dan Carpenter Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/mellanox/mlx4/mcg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/net/ethernet/mellanox/mlx4/mcg.c +++ b/drivers/net/ethernet/mellanox/mlx4/mcg.c @@ -1109,7 +1109,7 @@ int mlx4_qp_attach_common(struct mlx4_de struct mlx4_cmd_mailbox *mailbox; struct mlx4_mgm *mgm; u32 members_count; - int index, prev; + int index = -1, prev; int link = 0; int i; int err; @@ -1188,7 +1188,7 @@ int mlx4_qp_attach_common(struct mlx4_de goto out; out: - if (prot == MLX4_PROT_ETH) { + if (prot == MLX4_PROT_ETH && index != -1) { /* manage the steering entry for promisc mode */ if (new_entry) err = new_steering_entry(dev, port, steer,