Received: by 2002:ac0:bc90:0:0:0:0:0 with SMTP id a16csp268710img; Mon, 18 Mar 2019 02:42:29 -0700 (PDT) X-Google-Smtp-Source: APXvYqzoTK1jLxr0VMcJLv+ZrGYAnfvhomaZwJjlroaVMcqtKGyblxtgPFWT1rNU8hWa0IQdc6j7 X-Received: by 2002:a65:4542:: with SMTP id x2mr16607981pgr.65.1552902149819; Mon, 18 Mar 2019 02:42:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552902149; cv=none; d=google.com; s=arc-20160816; b=Ba0gc4s3UgLb1/aSBk9plq1wmpEPhP6vR9yFJf6jtpsK3LFCmNYE9VtozXGdqZrXp4 7SeFAxXRiP0/7HGv+dSrOtpPsTLjU64Eco6IP2xqM4aVuIZ6lLaMMjGblG8gF9kvNw94 Wic9YgIgPALQmocxKr11ZnDNziXMU0enq4rifRIkNJE4LaLG7zxtHpoUPqrbh28G7Z+y zqwx7EoFTfVyyaigVe3zZpoiYspPoven9svUof2RhHVzjgXJcjYkpFGLIVsodfEq7y/r 1uatbr9XopCpRbxUs/40gHD30cxWsmgF1vCG4EYMsCnoypIK8LW1GKBFodrhVJudBEb0 /gIA== 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=hDcq1LbIf6OlJIwK+7Bx6pd76h9mJD55lqZ/f61zEy4=; b=youEuiq5sYbSZ2sld28iHljOZ9KvPvjNGrwXHWblDdHwubPydJ2/XQRwJSaXjkzbzx B4phyI1XeYv5jZQxEmfbETHOD26NKQf5qpzukji/lZRCMMvm1E/Et2qVutWcxErVWm3c VtWH7x7fjDJO8ctOISp8Tb7zPbsq7ukuovYK1ENTV86t0MlBfrdvd5QvLTpS1hqhpRZF E+FglbYHTgnfFtu7GGf0F7TAfSuFInwai4oEtOJgFU55KbSyT/5lRmJtPZxvdVrL0TOD Hpk9uBJaAXbk9Byy9Hqp7cSDkNbCCPjzYlfJhBWMA3Hwbp0layG8A9GNos3KDwLfwcvF lrQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=SGEmWjkR; 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 s14si8489147pgs.98.2019.03.18.02.42.14; Mon, 18 Mar 2019 02:42:29 -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=SGEmWjkR; 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 S2387413AbfCRJec (ORCPT + 99 others); Mon, 18 Mar 2019 05:34:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:42950 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387401AbfCRJea (ORCPT ); Mon, 18 Mar 2019 05:34:30 -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 91E092083D; Mon, 18 Mar 2019 09:34:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552901670; bh=xo/aSHFm+/h8RTG8CkNYZ5BHIkHszApkz7/t/ZSm4gM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SGEmWjkRPEGhrIastiXIQYfW24eme2sQi0fHg9fF+whdm/wjGlYE6uEUWmaAztovF sWd+HuWX1c6qXAeUqMtFwdworVtDI8UU+SGEvlHMPz4XpEb95pkLCmPEwaBCIFnHWb Beg9BFZg5LcXM6CMZHZfntH0iGskQg+scDAILOAA= 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 4.14 13/34] route: set the deleted fnhe fnhe_daddr to 0 in ip_del_fnhe to fix a race Date: Mon, 18 Mar 2019 10:25:37 +0100 Message-Id: <20190318084146.508325070@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190318084144.657740413@linuxfoundation.org> References: <20190318084144.657740413@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.14-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 @@ -1315,6 +1315,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;