From patchwork Tue Mar 13 19:50:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Salvatore Mesoraca X-Patchwork-Id: 885443 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@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="HTGsgeG0"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40157v300tz9sTC for ; Wed, 14 Mar 2018 06:51:07 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752787AbeCMTu5 (ORCPT ); Tue, 13 Mar 2018 15:50:57 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:35390 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752740AbeCMTuz (ORCPT ); Tue, 13 Mar 2018 15:50:55 -0400 Received: by mail-wm0-f68.google.com with SMTP id x7so140257wmc.0; Tue, 13 Mar 2018 12:50:54 -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; bh=kAZx9DFIAm0eV3zHFogGRnY2Cp5kqjv02JdW5cXaKok=; b=HTGsgeG0PSIsK2me/P31r7TXno04clpkvhONagv4RLHHVeUaXZf/2K0q87bKzLvFKw 43ngYP73wrB/eWcqUM6U2YMliwO22qGPYP1V3Zzgz1oXd56WtR/EDD2eOonN9tgY0g1l pBVVNrZgNfN2we8AzLkhlqk974DOG09kvCp1qtyiz9z5GFH9e2d4THeR9RboJJ8RphX3 4C8v7ePiQo3rOm6M13bpTq+xnYu4IDQCDqtfqpWgL+wn4nzuGyiF3nfd+l1q5TXmsstQ gH3nZWGTzbhcQxv0pvSRlpanmSM0eAJLK5hGTromzTf/VWSFqx1A+iKPNnqIZmY/+Onb X9Mg== 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; bh=kAZx9DFIAm0eV3zHFogGRnY2Cp5kqjv02JdW5cXaKok=; b=kjuX0PvF8ijTW1oaeZSAhrh1CSah+0c4HnO4B9PJNzFXfSswxGiwsqSH1a0k5ZB+4h ngLU4FUxO5BljSIhSBigtE5Ul/mLtHhB0cKjpaXUVQCakKEjKCiID04JCpJPakTNS++N FU9xX6RhgI+6AP/nESfq5tTmEsSRbLZ54zLm2N07AVtQ3kL5zXKbuIYs4k6bDmY5Z99g 9Ts0A/o1ZDkIjZ1m/DtCZlgDk3F3O7z6rBoEqy5O8kd63Mf/qdEyCzOvTOltDa6FUBXM TvRkYeU5v//Ladx6hEHChtqEt9NkzPL3qnGw2hBUubFLbrhX4L/AQW++I9WDd/2tQuph iF/g== X-Gm-Message-State: AElRT7GEITCQ1aEUTevQjEzXcnV8nyae7km5acPjrU1CSzx8sFA57AzO M6Jr2MGXpFqfv/YqcHJmjVohV31+YLA= X-Google-Smtp-Source: AG47ELtciVlIFt+kiGm37hplSrnoytbJXUJKxvhTSdZFD19cLPs4gfP1WG+QeiDJDpXess+E1MVovg== X-Received: by 10.28.141.4 with SMTP id p4mr1802393wmd.59.1520970653565; Tue, 13 Mar 2018 12:50:53 -0700 (PDT) Received: from localhost ([37.176.236.47]) by smtp.gmail.com with ESMTPSA id x7sm1173546wrd.76.2018.03.13.12.50.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 13 Mar 2018 12:50:53 -0700 (PDT) From: Salvatore Mesoraca To: linux-kernel@vger.kernel.org Cc: kernel-hardening@lists.openwall.com, netdev@vger.kernel.org, "David S. Miller" , Andrew Lunn , Florian Fainelli , Kees Cook , Salvatore Mesoraca , Vivien Didelot Subject: [PATCH] net: dsa: drop some VLAs in switch.c Date: Tue, 13 Mar 2018 20:50:47 +0100 Message-Id: <1520970647-19587-1-git-send-email-s.mesoraca16@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org dsa_switch's num_ports is currently fixed to DSA_MAX_PORTS. So we avoid 2 VLAs[1] by using DSA_MAX_PORTS instead of ds->num_ports. [1] https://lkml.org/lkml/2018/3/7/621 Signed-off-by: Salvatore Mesoraca --- net/dsa/switch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/dsa/switch.c b/net/dsa/switch.c index b935117..78e9897 100644 --- a/net/dsa/switch.c +++ b/net/dsa/switch.c @@ -136,7 +136,7 @@ static int dsa_switch_mdb_add(struct dsa_switch *ds, { const struct switchdev_obj_port_mdb *mdb = info->mdb; struct switchdev_trans *trans = info->trans; - DECLARE_BITMAP(group, ds->num_ports); + DECLARE_BITMAP(group, DSA_MAX_PORTS); int port; /* Build a mask of Multicast group members */ @@ -204,7 +204,7 @@ static int dsa_switch_vlan_add(struct dsa_switch *ds, { const struct switchdev_obj_port_vlan *vlan = info->vlan; struct switchdev_trans *trans = info->trans; - DECLARE_BITMAP(members, ds->num_ports); + DECLARE_BITMAP(members, DSA_MAX_PORTS); int port; /* Build a mask of VLAN members */