From patchwork Thu Mar 19 13:00:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 228947 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.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,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 C1574C43332 for ; Thu, 19 Mar 2020 13:37:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8F7C220789 for ; Thu, 19 Mar 2020 13:37:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584625047; bh=5m/4LNJzcgDOPgG1OQAwVGIz81GYUpumboa+v5QL+i8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=N4e1P1sSLjJhG/sDHj4lBkJsgSTTeSu9CGb/bdNgr5YQIwPlbNSFyWLJV5RcZ5q16 8tmDauDp2Kcrv1hUyUfxsTRhVMVaUkGFg2fgAufC8e/LjbUxfSArMJT9uQJfuPiy0R fXdFChuOwuwe78VAVxsleLMaEyU9E/mIGCAa6ASk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727669AbgCSNhZ (ORCPT ); Thu, 19 Mar 2020 09:37:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:52470 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727192AbgCSNIU (ORCPT ); Thu, 19 Mar 2020 09:08:20 -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 7A726208DB; Thu, 19 Mar 2020 13:08:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584623299; bh=5m/4LNJzcgDOPgG1OQAwVGIz81GYUpumboa+v5QL+i8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QaLnj0+G8bsJ9iWF1rnckjKREPyzUgqm8Gz3u6oe7ZDS+4WvKauHU9+OKLDVF3SK/ tVE4DnFkM21ITXZMByQ7bDZwlqVbCfvSnfCcqQejfLG25OorFcxjS22flfuKpVLLIO /O/aOCFAeMggr+Bi9lzxT4ELCm9is9yb3IdOltDw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Greg Kroah-Hartman , Sven Eckelmann , Marek Lindner , Simon Wunderlich Subject: [PATCH 4.4 59/93] batman-adv: Free last_bonding_candidate on release of orig_node Date: Thu, 19 Mar 2020 14:00:03 +0100 Message-Id: <20200319123943.584894613@linuxfoundation.org> X-Mailer: git-send-email 2.25.2 In-Reply-To: <20200319123924.795019515@linuxfoundation.org> References: <20200319123924.795019515@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Sven Eckelmann commit cbef1e102003edb236c6b2319ab269ccef963731 upstream. The orig_ifinfo reference counter for last_bonding_candidate in batadv_orig_node has to be reduced when an originator node is released. Otherwise the orig_ifinfo is leaked and the reference counter the netdevice is not reduced correctly. Fixes: f3b3d9018975 ("batman-adv: add bonding again") Signed-off-by: Sven Eckelmann Signed-off-by: Marek Lindner Signed-off-by: Simon Wunderlich Signed-off-by: Greg Kroah-Hartman --- net/batman-adv/originator.c | 7 +++++++ 1 file changed, 7 insertions(+) --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@ -565,6 +565,7 @@ static void batadv_orig_node_release(str struct batadv_neigh_node *neigh_node; struct batadv_orig_ifinfo *orig_ifinfo; struct batadv_orig_node_vlan *vlan; + struct batadv_orig_ifinfo *last_candidate; spin_lock_bh(&orig_node->neigh_list_lock); @@ -580,8 +581,14 @@ static void batadv_orig_node_release(str hlist_del_rcu(&orig_ifinfo->list); batadv_orig_ifinfo_free_ref(orig_ifinfo); } + + last_candidate = orig_node->last_bonding_candidate; + orig_node->last_bonding_candidate = NULL; spin_unlock_bh(&orig_node->neigh_list_lock); + if (last_candidate) + batadv_orig_ifinfo_free_ref(last_candidate); + spin_lock_bh(&orig_node->vlan_list_lock); hlist_for_each_entry_safe(vlan, node_tmp, &orig_node->vlan_list, list) { hlist_del_rcu(&vlan->list);