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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 072B7C49ED7 for ; Thu, 19 Sep 2019 22:10:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CF2C621907 for ; Thu, 19 Sep 2019 22:10:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568931038; bh=D8BjZR/3dK83sXzD9E06btJTybonkgJLwdB8DhwSuVA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=pIchV8QXZ3FD5Zm5Jlb67FX2aiQx1zLrvXyCW/PQXO9Eehl7B+zpLmEXhwxSwLaqm 6SngW8W8Z9suR+6Y79bbcqjH/VQRy3u10SDShavkkjbap84dbUAmwnjR0S5yimxS8L SeOVkn+IU2V0VfwKAsvL3ckQ53PGBoBHP/yGEXsU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405717AbfISWKi (ORCPT ); Thu, 19 Sep 2019 18:10:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:48988 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405693AbfISWKe (ORCPT ); Thu, 19 Sep 2019 18:10:34 -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 4AF6821907; Thu, 19 Sep 2019 22:10:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568931033; bh=D8BjZR/3dK83sXzD9E06btJTybonkgJLwdB8DhwSuVA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yTdylbTfretBRUU2McgPM9KPFf3S75bhByPKuvSNdyvPaMesafkOwqSQ5196q/eAA pCFlwGoi2l5+waHA1oOk/ooiirJ9eGlHKPZVBWJEaQQUnEK/poONWkqHqTfF1hpHdl DY0AxZ9LmAzwhjhzLD5iUnNIC9PSYPfTNF/TSqME= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dmitry Bogdanov , Igor Russkikh , "David S. Miller" , Sasha Levin Subject: [PATCH 5.2 102/124] net: aquantia: fix removal of vlan 0 Date: Fri, 20 Sep 2019 00:03:10 +0200 Message-Id: <20190919214822.916609969@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190919214819.198419517@linuxfoundation.org> References: <20190919214819.198419517@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 [ Upstream commit 6fdc060d7476ef73c8029b652d252c1a7b4de948 ] Due to absence of checking against the rx flow rule when vlan 0 is being removed, the other rule could be removed instead of the rule with vlan 0 Fixes: 7975d2aff5afb ("net: aquantia: add support of rx-vlan-filter offload") Signed-off-by: Dmitry Bogdanov Signed-off-by: Igor Russkikh Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/aquantia/atlantic/aq_filters.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_filters.c b/drivers/net/ethernet/aquantia/atlantic/aq_filters.c index 2c1111a7fc435..3dbf3ff1c4506 100644 --- a/drivers/net/ethernet/aquantia/atlantic/aq_filters.c +++ b/drivers/net/ethernet/aquantia/atlantic/aq_filters.c @@ -431,7 +431,8 @@ int aq_del_fvlan_by_vlan(struct aq_nic_s *aq_nic, u16 vlan_id) if (be16_to_cpu(rule->aq_fsp.h_ext.vlan_tci) == vlan_id) break; } - if (rule && be16_to_cpu(rule->aq_fsp.h_ext.vlan_tci) == vlan_id) { + if (rule && rule->type == aq_rx_filter_vlan && + be16_to_cpu(rule->aq_fsp.h_ext.vlan_tci) == vlan_id) { struct ethtool_rxnfc cmd; cmd.fs.location = rule->aq_fsp.location; -- 2.20.1