From patchwork Thu Aug 9 18:30:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Flavio Leitner X-Patchwork-Id: 176213 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 A9A332C0089 for ; Fri, 10 Aug 2012 04:31:53 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758937Ab2HISbv (ORCPT ); Thu, 9 Aug 2012 14:31:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:29961 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753981Ab2HISbu (ORCPT ); Thu, 9 Aug 2012 14:31:50 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q79IVSDu029511 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 9 Aug 2012 14:31:28 -0400 Received: from localhost (ovpn-116-21.ams2.redhat.com [10.36.116.21]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q79IVQ7q018744; Thu, 9 Aug 2012 14:31:27 -0400 From: Flavio Leitner To: netdev Cc: Jay Vosburgh , Andy Gospodarek , Leonardo Chiquitto , Flavio Leitner Subject: [net-next] bonding: don't allow the master to become its slave Date: Thu, 9 Aug 2012 15:30:49 -0300 Message-Id: <1344537049-11473-1-git-send-email-fbl@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org It doesn't make any sense to allow the master to become its slave. That creates a loop of events causing a crash. Reported-by: Leonardo Chiquitto Signed-off-by: Flavio Leitner Tested-by: Leonardo Chiquitto --- drivers/net/bonding/bond_main.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 6fae5f3..5407b44 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -1505,6 +1505,11 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev) int link_reporting; int res = 0; + if (bond_dev == slave_dev) { + pr_err("%s: Error: cannot enslave itself.\n", bond_dev->name); + return -EINVAL; + } + if (!bond->params.use_carrier && slave_dev->ethtool_ops == NULL && slave_ops->ndo_do_ioctl == NULL) { pr_warning("%s: Warning: no link monitoring support for %s\n",