From mboxrd@z Thu Jan 1 00:00:00 1970 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 A567EC3F2D1 for ; Tue, 3 Mar 2020 17:56:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 823E5206D5 for ; Tue, 3 Mar 2020 17:56:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583258216; bh=6baVSeaPeZngpOF0zDPEwvISGo1cuZHYG8DXixry+zQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Cf9H/TYk//b8GjCTf0UcDamhxwVBGyiA77zDPnjIpgAErW/zsiyFW3AZ0MOp7looR 953Z9pNvR2pogqWKyhoGsbHQVUxBo7cEnUX9BeiIA6/DrWLAwzunCeFEkVRP1oN4lX h7Y37xT/pDX+WBKj6xzdnNzmca33H/6tNi+785PY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732951AbgCCR4n (ORCPT ); Tue, 3 Mar 2020 12:56:43 -0500 Received: from mail.kernel.org ([198.145.29.99]:38982 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732942AbgCCR4k (ORCPT ); Tue, 3 Mar 2020 12:56:40 -0500 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 48EF520728; Tue, 3 Mar 2020 17:56:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583258199; bh=6baVSeaPeZngpOF0zDPEwvISGo1cuZHYG8DXixry+zQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=u72DMeE5ADaJ94R2neJvGyhBAvYGfmCFcyHp6Htzwo98BEZGYLkCLoeRUTQRT1MLo TvANQ8i6nwmhQdcAEz9abuAg7ceR+brkSRXh9VmPlT2iG0PuTz+UEzRqioBi2WrxFs P3WH2sGLeG14y31IvnvdWF6wHZTKDoekfH7ABNiU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , Dmitry Bogdanov , "David S. Miller" Subject: [PATCH 5.4 109/152] net: atlantic: fix out of range usage of active_vlans array Date: Tue, 3 Mar 2020 18:43:27 +0100 Message-Id: <20200303174315.082944131@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200303174302.523080016@linuxfoundation.org> References: <20200303174302.523080016@linuxfoundation.org> User-Agent: quilt/0.66 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 From: Dmitry Bogdanov commit 5a292c89a84d49b598f8978f154bdda48b1072c0 upstream. fix static checker warning: drivers/net/ethernet/aquantia/atlantic/aq_filters.c:166 aq_check_approve_fvlan() error: passing untrusted data to 'test_bit()' Reported-by: Dan Carpenter Fixes: 7975d2aff5af: ("net: aquantia: add support of rx-vlan-filter offload") Signed-off-by: Dmitry Bogdanov Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/aquantia/atlantic/aq_filters.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/net/ethernet/aquantia/atlantic/aq_filters.c +++ b/drivers/net/ethernet/aquantia/atlantic/aq_filters.c @@ -158,7 +158,7 @@ aq_check_approve_fvlan(struct aq_nic_s * } if ((aq_nic->ndev->features & NETIF_F_HW_VLAN_CTAG_FILTER) && - (!test_bit(be16_to_cpu(fsp->h_ext.vlan_tci), + (!test_bit(be16_to_cpu(fsp->h_ext.vlan_tci) & VLAN_VID_MASK, aq_nic->active_vlans))) { netdev_err(aq_nic->ndev, "ethtool: unknown vlan-id specified");