Received: by 2002:ac0:bc90:0:0:0:0:0 with SMTP id a16csp273085img; Mon, 18 Mar 2019 02:49:59 -0700 (PDT) X-Google-Smtp-Source: APXvYqzXHtrfs9gSc+XCkjE8bHTCtMzcEfQERaUEv/LAN4+SAuBReqgxIuSBY1HNmeDWWEb486LU X-Received: by 2002:a63:fe0d:: with SMTP id p13mr16175801pgh.366.1552902599056; Mon, 18 Mar 2019 02:49:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552902599; cv=none; d=google.com; s=arc-20160816; b=sXR3YI990UapFPQCB8hftKbzd7YfqbFszKYCDZ/NqCr+WfpNgO+PlwPJ0QLCMP1mbg OYDrOCvUPfDlh8HCR4KxOgyLsHlAozyjHl3wwq5iqwD3DcwcjHHfmuCL32Cb0z/H/jNe hnDk3CLnCvaPb3vWp1AsHNwqS9aC9GOynSfKKY08K8h4QlFE5LSDzq3Cl3Ks9momtuh8 x8PV6rb0zKzFx3H+9SX728o8lm2G1niB1VBs3f+hkQRopNpVhNS8AzGVNJ2yG+0bXo1o eSoK5jxTa8Eau5ItG1pvuXUh2jaznud9WcdYVIVsUXv3RUMkF10lBsQlmYs1pvu1Sc9H /kjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=oA5OD75V5VVbjibHehZrjSnbYjCIcBUeO3vFPROHV3g=; b=VgY2ab5tWrAVMuRVJyIPu6lXhP/tXezqbZxkmXrOXif9wcyRmSP1sdsZWz8G9qA8L0 FvQf1+dZ32A12lBsXQ5gPHnkrpPtY3mB9E3vCVsSEi8Em5CmjsojcEE4VzFcekBqwkKg VKY+SzU5fkJuT2xYtUJEueiy4dZD8HejikV3NuU46wo/Ami82y7FrpX0o67elZx+Ok7P 9WPCM0hcy8MrfCscwBO9C8V7Va4SU/AdOOEhrDGq23FA1g8Un8sIl7RZICqVr6rpch+W ntaHrJsrmIDUItzDQ6YGi+/tj7d5Q23Gd2u3DW/vtWajES2ByL70btwVNVfRiCtj/Ujv Su5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=lN2yPWJm; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v17si9102899pff.214.2019.03.18.02.49.44; Mon, 18 Mar 2019 02:49:59 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=lN2yPWJm; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727564AbfCRJ0k (ORCPT + 99 others); Mon, 18 Mar 2019 05:26:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:59628 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727514AbfCRJ0i (ORCPT ); Mon, 18 Mar 2019 05:26:38 -0400 Received: from localhost (5356596B.cm-6-7b.dynamic.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 424062075C; Mon, 18 Mar 2019 09:26:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552901197; bh=QF8UI1Hhc1Ep9BM0QE4gKzPTu2ONnyxuxC7oV/D4F/E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lN2yPWJmvQE/FxmIzbFukUYRIrrh1YdrPtecoNwsSDcAX0om9YwAOOEaA3qlQWnfU VOxQmhaHUQaT8kAQ6vPsujBr8l32mAlp7wKe3Re+dRZX754RJNbXVJ/7W6DlD1mWdi CVZFXmykcLaTAOm4guLNKpJLwFKZYO5O7eGQUe0k= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jon Maxwell , Xin Long , David Ahern , "David S. Miller" Subject: [PATCH 5.0 16/43] route: set the deleted fnhe fnhe_daddr to 0 in ip_del_fnhe to fix a race Date: Mon, 18 Mar 2019 10:24:08 +0100 Message-Id: <20190318083716.348107136@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190318083715.877441740@linuxfoundation.org> References: <20190318083715.877441740@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 5.0-stable review patch. If anyone has any objections, please let me know. ------------------ From: Xin Long [ Upstream commit ee60ad219f5c7c4fb2f047f88037770063ef785f ] The race occurs in __mkroute_output() when 2 threads lookup a dst: CPU A CPU B find_exception() find_exception() [fnhe expires] ip_del_fnhe() [fnhe is deleted] rt_bind_exception() In rt_bind_exception() it will bind a deleted fnhe with the new dst, and this dst will get no chance to be freed. It causes a dev defcnt leak and consecutive dmesg warnings: unregister_netdevice: waiting for ethX to become free. Usage count = 1 Especially thanks Jon to identify the issue. This patch fixes it by setting fnhe_daddr to 0 in ip_del_fnhe() to stop binding the deleted fnhe with a new dst when checking fnhe's fnhe_daddr and daddr in rt_bind_exception(). It works as both ip_del_fnhe() and rt_bind_exception() are protected by fnhe_lock and the fhne is freed by kfree_rcu(). Fixes: deed49df7390 ("route: check and remove route cache when we get route") Signed-off-by: Jon Maxwell Signed-off-by: Xin Long Reviewed-by: David Ahern Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/ipv4/route.c | 4 ++++ 1 file changed, 4 insertions(+) --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -1303,6 +1303,10 @@ static void ip_del_fnhe(struct fib_nh *n if (fnhe->fnhe_daddr == daddr) { rcu_assign_pointer(*fnhe_p, rcu_dereference_protected( fnhe->fnhe_next, lockdep_is_held(&fnhe_lock))); + /* set fnhe_daddr to 0 to ensure it won't bind with + * new dsts in rt_bind_exception(). + */ + fnhe->fnhe_daddr = 0; fnhe_flush_routes(fnhe); kfree_rcu(fnhe, rcu); break;