From patchwork Tue Oct 20 19:36:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Feldman X-Patchwork-Id: 533130 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 1EC7B14110E for ; Wed, 21 Oct 2015 06:34:03 +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=Cg2G8OHc; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752031AbbJTTd6 (ORCPT ); Tue, 20 Oct 2015 15:33:58 -0400 Received: from mail-pa0-f50.google.com ([209.85.220.50]:33887 "EHLO mail-pa0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751273AbbJTTd5 (ORCPT ); Tue, 20 Oct 2015 15:33:57 -0400 Received: by padhk11 with SMTP id hk11so29994026pad.1 for ; Tue, 20 Oct 2015 12:33:57 -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=/tNWw6Ah+7Aolui+e3xBm0yPP5Q43UcSca0sQLQeTJk=; b=Cg2G8OHcFnOQw39SBmkFJJ2UAsNcfkyc1VjxzkcgdhKMdkOVMKckYYcODtH6Y6GWog Km3F+9qagj6L+sf8wZRaXGfb72jqodcsdLlDnukqr8+X2OGyqTCfcMXncDsor4GnyyA2 gHcftb1vV1C+V5A7Nff49QaC+qfGAWiZWGEaUjsx4pnQhLrDlOeHRs6eBDjDbGBfXyFw n1BRDInBlczhy8y3tFypZRy8Uxxkvrs0eq8RORDq3CNLoUx5khvr4YnK1jmqk0keyj41 LP9iJXC+wjGWDwFG5D7wWqFf7J65t7VZygG9kxqFy3Xc8+n/OE7U3102CWCbvhw5+PJK nLwg== X-Received: by 10.67.15.100 with SMTP id fn4mr5953484pad.120.1445369637206; Tue, 20 Oct 2015 12:33:57 -0700 (PDT) Received: from rocker1.rocker.net ([199.58.98.35]) by smtp.gmail.com with ESMTPSA id dn4sm5177347pbd.0.2015.10.20.12.33.56 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Oct 2015 12:33:56 -0700 (PDT) From: sfeldma@gmail.com To: netdev@vger.kernel.org Cc: jiri@resnulli.us, siva.mannem.lnx@gmail.com, vivien.didelot@savoirfairelinux.com Subject: [PATCH net-next 1/3] switchdev: fix: erasing too much of vlan obj when handling multiple vlan specs Date: Tue, 20 Oct 2015 12:36:37 -0700 Message-Id: <1445369799-2345-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 --- 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; } }