From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1B844C43219 for ; Tue, 30 Apr 2019 11:47:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E041721734 for ; Tue, 30 Apr 2019 11:47:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556624877; bh=kNLEkDNqDIPHFOrHu1Pv3oTZu0+9OW87EzZ8XsfrTgA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=CksSNYxep1qWolrN7gzXTkWialObPW348MBuNR0zc1veQsYwJtdvJuN3+aDJZJVPa zVgvcT2RfZoTSIYr6XyAlf12efUF78qOCW45D3iDmqhS7pEvf0oLadyUmjPZ/yn6bF 7RWV5Rr788vO95F+cYfx/WJJv62Xsd3WORo+a76U= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729004AbfD3Lrz (ORCPT ); Tue, 30 Apr 2019 07:47:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:33668 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730212AbfD3Lrx (ORCPT ); Tue, 30 Apr 2019 07:47:53 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8C4A421670; Tue, 30 Apr 2019 11:47:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556624873; bh=kNLEkDNqDIPHFOrHu1Pv3oTZu0+9OW87EzZ8XsfrTgA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=an/p+eJih/7XNA35kTHAUn2E4khQ9k/VKNSpUQLgtkT/e7PK2U6wF4YfpqvnfyOJD 9tTV997/0CfbQgJgkAP9zFVqpl3XoT0xuMUEdi9aBvMcK7eD39s1QNHJI6n5uOkGoK zP2NsfyhXtCCYK2omjBIqoE6fvZZFeXWF0BWe/yA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jiri Pirko , Hangbin Liu , "David S. Miller" Subject: [PATCH 4.19 093/100] team: fix possible recursive locking when add slaves Date: Tue, 30 Apr 2019 13:39:02 +0200 Message-Id: <20190430113613.211637903@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190430113608.616903219@linuxfoundation.org> References: <20190430113608.616903219@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Hangbin Liu [ Upstream commit 925b0c841e066b488cc3a60272472b2c56300704 ] If we add a bond device which is already the master of the team interface, we will hold the team->lock in team_add_slave() first and then request the lock in team_set_mac_address() again. The functions are called like: - team_add_slave() - team_port_add() - team_port_enter() - team_modeop_port_enter() - __set_port_dev_addr() - dev_set_mac_address() - bond_set_mac_address() - dev_set_mac_address() - team_set_mac_address Although team_upper_dev_link() would check the upper devices but it is called too late. Fix it by adding a checking before processing the slave. v2: Do not split the string in netdev_err() Fixes: 3d249d4ca7d0 ("net: introduce ethernet teaming device") Acked-by: Jiri Pirko Signed-off-by: Hangbin Liu Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/team/team.c | 7 +++++++ 1 file changed, 7 insertions(+) --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c @@ -1160,6 +1160,13 @@ static int team_port_add(struct team *te return -EINVAL; } + if (netdev_has_upper_dev(dev, port_dev)) { + NL_SET_ERR_MSG(extack, "Device is already an upper device of the team interface"); + netdev_err(dev, "Device %s is already an upper device of the team interface\n", + portname); + return -EBUSY; + } + if (port_dev->features & NETIF_F_VLAN_CHALLENGED && vlan_uses_dev(dev)) { NL_SET_ERR_MSG(extack, "Device is VLAN challenged and team device has VLAN set up");