From patchwork Mon Jan 4 23:20:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kamal Mostafa X-Patchwork-Id: 562738 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 2B6F81402C0; Tue, 5 Jan 2016 10:21:19 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1aGER7-000723-M5; Mon, 04 Jan 2016 23:21:13 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1aGEQk-0006kZ-3A for kernel-team@lists.ubuntu.com; Mon, 04 Jan 2016 23:20:50 +0000 Received: from 1.general.kamal.us.vpn ([10.172.68.52] helo=fourier) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1aGEQj-00069A-LB; Mon, 04 Jan 2016 23:20:49 +0000 Received: from kamal by fourier with local (Exim 4.82) (envelope-from ) id 1aGEQg-0005tG-U2; Mon, 04 Jan 2016 15:20:46 -0800 From: Kamal Mostafa To: Scott Feldman Subject: [4.2.y-ckt stable] Patch "bridge: fix netlink max attr size" has been added to staging queue Date: Mon, 4 Jan 2016 15:20:45 -0800 Message-Id: <1451949645-22612-1-git-send-email-kamal@canonical.com> X-Mailer: git-send-email 1.9.1 X-Extended-Stable: 4.2 Cc: Kamal Mostafa , "David S. Miller" , kernel-team@lists.ubuntu.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com This is a note to let you know that I have just added a patch titled bridge: fix netlink max attr size to the linux-4.2.y-queue branch of the 4.2.y-ckt extended stable tree which can be found at: http://kernel.ubuntu.com/git/ubuntu/linux.git/log/?h=linux-4.2.y-queue This patch is scheduled to be released in version 4.2.8-ckt1. If you, or anyone else, feels it should not be added to this tree, please reply to this email. For more information about the 4.2.y-ckt tree, see https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable Thanks. -Kamal ------ From bb5d27887594f4e8b5f3d63e987aebfbfb18ba59 Mon Sep 17 00:00:00 2001 From: Scott Feldman Date: Wed, 19 Aug 2015 11:29:35 -0700 Subject: bridge: fix netlink max attr size commit eb4cb85180cd3baee4a01fd32e296fc28c2cffc1 upstream. .maxtype should match .policy. Probably just been getting lucky here because IFLA_BRPORT_MAX > IFLA_BR_MAX. Fixes: 13323516 ("bridge: implement rtnl_link_ops->changelink") Signed-off-by: Scott Feldman Signed-off-by: David S. Miller Signed-off-by: Kamal Mostafa --- net/bridge/br_netlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 1.9.1 diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c index 4d74a06..b72be49 100644 --- a/net/bridge/br_netlink.c +++ b/net/bridge/br_netlink.c @@ -839,7 +839,7 @@ struct rtnl_link_ops br_link_ops __read_mostly = { .kind = "bridge", .priv_size = sizeof(struct net_bridge), .setup = br_dev_setup, - .maxtype = IFLA_BRPORT_MAX, + .maxtype = IFLA_BR_MAX, .policy = br_policy, .validate = br_validate, .newlink = br_dev_newlink,