Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp2533043yba; Mon, 6 May 2019 07:36:37 -0700 (PDT) X-Google-Smtp-Source: APXvYqxUWvABae02QwjCDfxfKRQotM2myxhkONMypYmZV/BWf4UR3aFmbI2cgZxMc1fll51Vqh0q X-Received: by 2002:a63:5907:: with SMTP id n7mr32600227pgb.416.1557153397000; Mon, 06 May 2019 07:36:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557153396; cv=none; d=google.com; s=arc-20160816; b=TK2JctiM2Hf6jS0oZ66jrMHJ6PJ1NOx689wpRh2We69sIHsPlqXyic19VD5Hv2pZ7c fUvBKVwXobIIWiD1hsVtRI1Fs6h00O3vorCiNfiyoER9nNBdHAlQcjunu6WV33pHVzDk 2rJ6Mf4CQ2fNCCDgYSQgE3zS0d09tcDSq/YrXJ8WajRgocLlUGQwdbzieEZSu/zTNytZ DfoW4xhrmdjURvrcsY6rYJl3pNObViksRKEBezlkkImCSAoMrJG761oQ+IEaCuU0cyJD L55gN4gFjqa8aFB0g8TPydcwcQqXLq4d9PZ3WWyiBe/NEz9jxOnMoNvN3uleyLroc/dc V9Fw== 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=qplC5yJXDoKQ2U2d8IpK9M1PQZjYjlpherhE7Ycxocw=; b=u8kYjg9poKejribn5/SHhYcd8fu3wYIR9IB2qR40aaUdcNDLCtjsxqFG8xRw5R9Luh SHPFFA2ufHWFgl39Hwqyfi3Q5ppbSlljK7066nNBwS/LR93gKNPUeJQNGn9prm+/LY3Q ZoieixEBl4TuUOZ88uXcQPB2fFRZY5/ViyHO7piv4eZk9oMCg0zett0PQF6NLDt7g8cd DdDB8Mk4wupeykXpwbwUOzFXo9jT+YSRWgDXiOF/BdltKmWGQi9rG5VS60O/DqdiUo9N yv30rYS3m0VugwdVx+wVOeRQmPOGtCkjmm3oTz0eQhLm61naMLnUU2rxd7jLcclFQO9u ThBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=L7Bcrzh6; 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 s12si14715100plp.420.2019.05.06.07.36.21; Mon, 06 May 2019 07:36:36 -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=L7Bcrzh6; 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 S1726788AbfEFOez (ORCPT + 99 others); Mon, 6 May 2019 10:34:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:54672 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726218AbfEFOev (ORCPT ); Mon, 6 May 2019 10:34:51 -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 060DF2087F; Mon, 6 May 2019 14:34:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557153290; bh=/lMAQ0fq+2tbQSTK0gFM652btUCcmPSzSarhNgH7LLo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=L7Bcrzh6Ob67t8cVm4D76uQz55oo3bhMQVzGj38pHLutzXGEEWUWR7B0abAEJ8LGN KvZEMOm4BBMn8INE4h6fVvTli6Lhbb7ykR/y6N931rnogExIdUS2XxB4vIoWose7wy JmAK3ePRmmeeKcVbPOvFXkmOkblPTnbSdbdfi7Sc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Martin Weinelt , Sven Eckelmann , Antonio Quartulli , Simon Wunderlich , "Sasha Levin (Microsoft)" Subject: [PATCH 5.0 034/122] batman-adv: Reduce tt_global hash refcnt only for removed entry Date: Mon, 6 May 2019 16:31:32 +0200 Message-Id: <20190506143057.901967431@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190506143054.670334917@linuxfoundation.org> References: <20190506143054.670334917@linuxfoundation.org> User-Agent: quilt/0.66 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 [ Upstream commit f131a56880d10932931e74773fb8702894a94a75 ] The batadv_hash_remove is a function which searches the hashtable for an entry using a needle, a hashtable bucket selection function and a compare function. It will lock the bucket list and delete an entry when the compare function matches it with the needle. It returns the pointer to the hlist_node which matches or NULL when no entry matches the needle. The batadv_tt_global_free is not itself protected in anyway to avoid that any other function is modifying the hashtable between the search for the entry and the call to batadv_hash_remove. It can therefore happen that the entry either doesn't exist anymore or an entry was deleted which is not the same object as the needle. In such an situation, the reference counter (for the reference stored in the hashtable) must not be reduced for the needle. Instead the reference counter of the actually removed entry has to be reduced. Otherwise the reference counter will underflow and the object might be freed before all its references were dropped. The kref helpers reported this problem as: refcount_t: underflow; use-after-free. Fixes: 7683fdc1e886 ("batman-adv: protect the local and the global trans-tables with rcu") Reported-by: Martin Weinelt Signed-off-by: Sven Eckelmann Acked-by: Antonio Quartulli Signed-off-by: Simon Wunderlich Signed-off-by: Sasha Levin (Microsoft) --- net/batman-adv/translation-table.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 2ee87d3ca6d0..6ec0e67be560 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -616,14 +616,26 @@ static void batadv_tt_global_free(struct batadv_priv *bat_priv, struct batadv_tt_global_entry *tt_global, const char *message) { + struct batadv_tt_global_entry *tt_removed_entry; + struct hlist_node *tt_removed_node; + batadv_dbg(BATADV_DBG_TT, bat_priv, "Deleting global tt entry %pM (vid: %d): %s\n", tt_global->common.addr, batadv_print_vid(tt_global->common.vid), message); - batadv_hash_remove(bat_priv->tt.global_hash, batadv_compare_tt, - batadv_choose_tt, &tt_global->common); - batadv_tt_global_entry_put(tt_global); + tt_removed_node = batadv_hash_remove(bat_priv->tt.global_hash, + batadv_compare_tt, + batadv_choose_tt, + &tt_global->common); + if (!tt_removed_node) + return; + + /* drop reference of remove hash entry */ + tt_removed_entry = hlist_entry(tt_removed_node, + struct batadv_tt_global_entry, + common.hash_entry); + batadv_tt_global_entry_put(tt_removed_entry); } /** -- 2.20.1