From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=rXFs=SV=vger.kernel.org=netdev-owner@kernel.org>
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=-4.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS 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 A51ADC282E0
	for <netdev@archiver.kernel.org>; Fri, 19 Apr 2019 21:58:33 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.kernel.org (Postfix) with ESMTP id 6917E217F9
	for <netdev@archiver.kernel.org>; Fri, 19 Apr 2019 21:58:33 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1726818AbfDSV6c (ORCPT <rfc822;netdev@archiver.kernel.org>);
        Fri, 19 Apr 2019 17:58:32 -0400
Received: from shards.monkeyblade.net ([23.128.96.9]:35956 "EHLO
        shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1725847AbfDSV6b (ORCPT
        <rfc822;netdev@vger.kernel.org>); Fri, 19 Apr 2019 17:58:31 -0400
Received: from localhost (unknown [IPv6:2601:601:9f80:35cd::d71])
        (using TLSv1 with cipher AES256-SHA (256/256 bits))
        (Client did not present a certificate)
        (Authenticated sender: davem-davemloft)
        by shards.monkeyblade.net (Postfix) with ESMTPSA id 48E2A103D40E2;
        Fri, 19 Apr 2019 14:58:31 -0700 (PDT)
Date:   Fri, 19 Apr 2019 14:58:30 -0700 (PDT)
Message-Id: <20190419.145830.716462456508554436.davem@davemloft.net>
To:     liuhangbin@gmail.com
Cc:     netdev@vger.kernel.org, jiri@resnulli.us, lucien.xin@gmail.com
Subject: Re: [PATCHv2 net] team: fix possible recursive locking when add
 slaves
From:   David Miller <davem@davemloft.net>
In-Reply-To: <20190419063100.5224-1-liuhangbin@gmail.com>
References: <20190417121211.21063-1-liuhangbin@gmail.com>
        <20190419063100.5224-1-liuhangbin@gmail.com>
X-Mailer: Mew version 6.8 on Emacs 26.1
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.5.12 (shards.monkeyblade.net [149.20.54.216]); Fri, 19 Apr 2019 14:58:31 -0700 (PDT)
Sender: netdev-owner@vger.kernel.org
Precedence: bulk
List-ID: <netdev.vger.kernel.org>
X-Mailing-List: netdev@vger.kernel.org

From: Hangbin Liu <liuhangbin@gmail.com>
Date: Fri, 19 Apr 2019 14:31:00 +0800

> 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 <jiri@mellanox.com>
> Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>

Applied and queued up for -stable, thanks.