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.0 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 7269BC43381 for ; Mon, 1 Apr 2019 17:12:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 42A9921925 for ; Mon, 1 Apr 2019 17:12:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554138776; bh=4F3c3vWpEtpzT5ZpE82lqS7z18eX/Ar5zDEckOfn0ec=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=gYrEUfmsYFhcAJxdIT8D4XQQz7KvuC3/GKGB+hefySrwlOtIrgCHtU0ewQhgxM4sr oUy9asB/B8PLy5PN5Q8l4ybFa4A94Wl1sYxDUYIMWSNY7iYelpJc17zaYVJviRw8Al vUDQfF5SvXKKAs/CeiB8p7+fkG/LrFGgxArDejb4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730417AbfDARMy (ORCPT ); Mon, 1 Apr 2019 13:12:54 -0400 Received: from mail.kernel.org ([198.145.29.99]:34788 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729799AbfDARMu (ORCPT ); Mon, 1 Apr 2019 13:12:50 -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 A7DE321925; Mon, 1 Apr 2019 17:12:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554138770; bh=4F3c3vWpEtpzT5ZpE82lqS7z18eX/Ar5zDEckOfn0ec=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KOGTUkEyTIl9fab7lhquf06IwjJsm4KVEnyhyWfJBeGkq5UHtvT8jCWaYJ7NZzLbN Vk+nCzTtsrS05L2+G2SH3gg3eZn9WHTXXfOKRt9tzNLNxn5i2Hj63MfqwEP5oV2DS+ PazcpbnKhalimbak58xt8gHc0SAEI7Aaqmz/1KQk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hulk Robot , YueHaibing , "David S. Miller" Subject: [PATCH 4.19 016/134] net-sysfs: call dev_hold if kobject_init_and_add success Date: Mon, 1 Apr 2019 19:00:52 +0200 Message-Id: <20190401170045.835720147@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190401170044.243719205@linuxfoundation.org> References: <20190401170044.243719205@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: YueHaibing [ Upstream commit a3e23f719f5c4a38ffb3d30c8d7632a4ed8ccd9e ] In netdev_queue_add_kobject and rx_queue_add_kobject, if sysfs_create_group failed, kobject_put will call netdev_queue_release to decrease dev refcont, however dev_hold has not be called. So we will see this while unregistering dev: unregister_netdevice: waiting for bcsh0 to become free. Usage count = -1 Reported-by: Hulk Robot Fixes: d0d668371679 ("net: don't decrement kobj reference count on init failure") Signed-off-by: YueHaibing Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/core/net-sysfs.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- a/net/core/net-sysfs.c +++ b/net/core/net-sysfs.c @@ -934,6 +934,8 @@ static int rx_queue_add_kobject(struct n if (error) return error; + dev_hold(queue->dev); + if (dev->sysfs_rx_queue_group) { error = sysfs_create_group(kobj, dev->sysfs_rx_queue_group); if (error) { @@ -943,7 +945,6 @@ static int rx_queue_add_kobject(struct n } kobject_uevent(kobj, KOBJ_ADD); - dev_hold(queue->dev); return error; } @@ -1472,6 +1473,8 @@ static int netdev_queue_add_kobject(stru if (error) return error; + dev_hold(queue->dev); + #ifdef CONFIG_BQL error = sysfs_create_group(kobj, &dql_group); if (error) { @@ -1481,7 +1484,6 @@ static int netdev_queue_add_kobject(stru #endif kobject_uevent(kobj, KOBJ_ADD); - dev_hold(queue->dev); return 0; }