From patchwork Tue May 15 23:01:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 914003 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="YEB/bIWH"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40ltPf4PR1z9s0y for ; Wed, 16 May 2018 09:02:30 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752619AbeEOXCT (ORCPT ); Tue, 15 May 2018 19:02:19 -0400 Received: from mail-pl0-f68.google.com ([209.85.160.68]:37710 "EHLO mail-pl0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752405AbeEOXCE (ORCPT ); Tue, 15 May 2018 19:02:04 -0400 Received: by mail-pl0-f68.google.com with SMTP id w19-v6so910595plq.4; Tue, 15 May 2018 16:02:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=8Xzq7hr4QV1EG9qspclCBbTxCp3z7J4mTj+Ap5Q+vkg=; b=YEB/bIWH4M8/g8tx4ejJbbCz8FatqEUYnzRWdyjcL58U7iMz8hPGon9dm3wRqUq1Y4 9JgxsvHiOZIPrBpw5wV1eBCRwQwIdy3XRURaI+Nu7o+P6dLzAaSPg1wZIanREjoDJ3tq 8ZPkDRBOtQAubyEcjdtlFGoZDxtogmMMYv3icaQvHdLibF8RAarv7Xt3mjn9fV8wAFSA iHSllCkClYbqtFrjCRp2m7eKs/isrDG0oFUTqfYlgLrSXTvNoxd4DKEJrpmN4ctXq6q1 aDONOG1mmt7+DK0FYXWx1EFOlW5yidRzPJwLIW0MRA7bqhaj4AkyEiIWyVbmLtfKgKcn WTFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=8Xzq7hr4QV1EG9qspclCBbTxCp3z7J4mTj+Ap5Q+vkg=; b=fKOOuOzgus8zQWh3JDWYg6hsskkl0NnrM9eS0a6uAAUnqRApwG5exylbjiTxT7hdBD SrJR3cbJVbjvRScoKVZ6caGVnbBqswMNnuJ/3eIKvR+u27OYh91b86ATTNa89Oj0HSaD AR3BSEeRvphguQAGShpBJaAli77L3WZZw+AGytS94PbrTF5KZwQjSH3jGJrE6rDsLM+Q xKIWaDobGtRSr0gOuW9i9wfWXxdVrAGbjQ1YVfM4w5TIt/9xqd8vLRoxgxg/KotrC7/X g3O54K7YQk5Rzc59gT3iiRCQ9aGst+PnbkJef4M8ihBtTqCFZZi+6pyVlxuW58GwuUXP gs+g== X-Gm-Message-State: ALKqPwf8GQxQQ4Upnh4ji9DmdL7IEy1NoK9uil1JUrwCnGTWkCDQEKhf JsMKVxtf9BKjiPAHIZLExzOZ5966 X-Google-Smtp-Source: AB8JxZofdasey0/kGe/Gt0hxj4xiVa5OHX0+q+iWkKKbSK0n+XlOJFHIlDw9jw1j/KVxydJXqfO9kA== X-Received: by 2002:a17:902:7b86:: with SMTP id w6-v6mr16879810pll.183.1526425323837; Tue, 15 May 2018 16:02:03 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.250]) by smtp.gmail.com with ESMTPSA id g26-v6sm1339517pfh.76.2018.05.15.16.02.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 May 2018 16:02:02 -0700 (PDT) From: Florian Fainelli To: netdev@vger.kernel.org Cc: Florian Fainelli , Andrew Lunn , Vivien Didelot , linux-kernel@vger.kernel.org (open list), opendmb@gmail.com, davem@davemloft.net Subject: [PATCH net v2 3/3] net: dsa: bcm_sf2: Fix IPv6 rule half deletion Date: Tue, 15 May 2018 16:01:25 -0700 Message-Id: <20180515230125.25886-4-f.fainelli@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180515230125.25886-1-f.fainelli@gmail.com> References: <20180515230125.25886-1-f.fainelli@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org It was possible to delete only one half of an IPv6, which would leave the second half still programmed and possibly in use. Instead of checking for the unused bitmap, we need to check the unique bitmap, and refuse any deletion that does not match that criteria. We also need to move that check from bcm_sf2_cfp_rule_del_one() into its caller: bcm_sf2_cfp_rule_del() otherwise we would not be able to delete second halves anymore that would not pass the first test. Fixes: ba0696c22e7c ("net: dsa: bcm_sf2: Add support for IPv6 CFP rules") Signed-off-by: Florian Fainelli --- drivers/net/dsa/bcm_sf2_cfp.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/net/dsa/bcm_sf2_cfp.c b/drivers/net/dsa/bcm_sf2_cfp.c index 6fd0f8a12cc2..b89acaee12d4 100644 --- a/drivers/net/dsa/bcm_sf2_cfp.c +++ b/drivers/net/dsa/bcm_sf2_cfp.c @@ -790,10 +790,6 @@ static int bcm_sf2_cfp_rule_del_one(struct bcm_sf2_priv *priv, int port, int ret; u32 reg; - /* Refuse deletion of unused rules, and the default reserved rule */ - if (!test_bit(loc, priv->cfp.used) || loc == 0) - return -EINVAL; - /* Indicate which rule we want to read */ bcm_sf2_cfp_rule_addr_set(priv, loc); @@ -831,6 +827,13 @@ static int bcm_sf2_cfp_rule_del(struct bcm_sf2_priv *priv, int port, u32 next_loc = 0; int ret; + /* Refuse deleting unused rules, and those that are not unique since + * that could leave IPv6 rules with one of the chained rule in the + * table. + */ + if (!test_bit(loc, priv->cfp.unique) || loc == 0) + return -EINVAL; + ret = bcm_sf2_cfp_rule_del_one(priv, port, loc, &next_loc); if (ret) return ret;