From patchwork Wed Oct 21 17:00:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Feldman X-Patchwork-Id: 533960 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 000B6140D16 for ; Thu, 22 Oct 2015 03:57:24 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=K6p5UyM5; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755751AbbJUQ5U (ORCPT ); Wed, 21 Oct 2015 12:57:20 -0400 Received: from mail-pa0-f54.google.com ([209.85.220.54]:35096 "EHLO mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753748AbbJUQ5T (ORCPT ); Wed, 21 Oct 2015 12:57:19 -0400 Received: by pasz6 with SMTP id z6so59693299pas.2 for ; Wed, 21 Oct 2015 09:57:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=1PEBlQLetYO/SRd8X4BFd2j/a7TDFsxQI/0HiOXQaCM=; b=K6p5UyM5I0BCwTk3H1JkY9hSr3xEnXWpYEQHIHvk9xi1eD9ddK9qR9Qfp85sTU5opG a1Rmc2YMOliNOuiXN9JU76s6W6HlIp/1gSLbMOkJEasHs36K9k1/UGHnTPQdKPzxd3w0 MpVHnnnJsIr9F/+TMz7cgjALFf2sjLJKHEiKSV5uw6PKvMMpdW/U6D1d4PKOvPfY1NOJ nDlODtb/PF+JmRMcZQX8YKOcUIlQ0YGJBniEYgxy8ZROxMkHlaXV6TByDNFl5s1vYwhz ta0oeVslKuSlHN83XYuqf8m9zQlfZfdAwQSLS4xggTX/3AxIQTtBDPf++AakOBGo1MfY hH1Q== X-Received: by 10.68.98.99 with SMTP id eh3mr11732961pbb.126.1445446639149; Wed, 21 Oct 2015 09:57:19 -0700 (PDT) Received: from rocker1.rocker.net ([199.58.98.35]) by smtp.gmail.com with ESMTPSA id xm9sm10077139pbc.32.2015.10.21.09.57.17 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Oct 2015 09:57:18 -0700 (PDT) From: sfeldma@gmail.com To: netdev@vger.kernel.org Cc: jiri@resnulli.us, vivien.didelot@savoirfairelinux.com Subject: [PATCH net-next v2 1/3] switchdev: fix: erasing too much of vlan obj when handling multiple vlan specs Date: Wed, 21 Oct 2015 10:00:19 -0700 Message-Id: <1445446821-26147-1-git-send-email-sfeldma@gmail.com> X-Mailer: git-send-email 1.7.10.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Scott Feldman When adding vlans with multiple IFLA_BRIDGE_VLAN_INFO attrs set in AFSPEC, we would wipe the vlan obj struct after the first IFLA_BRIDGE_VLAN_INFO. Fix this by only clearing what's necessary on each IFLA_BRIDGE_VLAN_INFO iteration. Fixes: 9e8f4a54 ("switchdev: push object ID back to object structure") Signed-off-by: Scott Feldman Acked-by: Jiri Pirko --- v1->v2: add Jiri's Acked-by net/switchdev/switchdev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c index 73e3895..56d8479 100644 --- a/net/switchdev/switchdev.c +++ b/net/switchdev/switchdev.c @@ -863,7 +863,7 @@ static int switchdev_port_br_afspec(struct net_device *dev, err = f(dev, &vlan.obj); if (err) return err; - memset(&vlan, 0, sizeof(vlan)); + vlan.vid_begin = 0; } else { if (vlan.vid_begin) return -EINVAL; @@ -872,7 +872,7 @@ static int switchdev_port_br_afspec(struct net_device *dev, err = f(dev, &vlan.obj); if (err) return err; - memset(&vlan, 0, sizeof(vlan)); + vlan.vid_begin = 0; } }