From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ve1eur01on0107.outbound.protection.outlook.com ([104.47.1.107]:45086 "EHLO EUR01-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751618AbeCNTRf (ORCPT ); Wed, 14 Mar 2018 15:17:35 -0400 Subject: [PATCH net-next 2/2] net: Use rtnl_lock_killable() in register_netdev() From: Kirill Tkhai To: davem@davemloft.net, ktkhai@virtuozzo.com, vyasevic@redhat.com, edumazet@google.com, nicolas.dichtel@6wind.com, netdev@vger.kernel.org Date: Wed, 14 Mar 2018 22:17:28 +0300 Message-ID: <152105504831.24797.8372021805674601073.stgit@localhost.localdomain> In-Reply-To: <152105492788.24797.10467675660981296096.stgit@localhost.localdomain> References: <152105492788.24797.10467675660981296096.stgit@localhost.localdomain> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: netdev-owner@vger.kernel.org List-ID: This patch adds rtnl_lock_killable() to one of hot path using rtnl_lock(). Signed-off-by: Kirill Tkhai --- net/core/dev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/core/dev.c b/net/core/dev.c index 12a9aad0b057..d8887cc38e7b 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -8018,7 +8018,8 @@ int register_netdev(struct net_device *dev) { int err; - rtnl_lock(); + if (rtnl_lock_killable()) + return -EINTR; err = register_netdevice(dev); rtnl_unlock(); return err;