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.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,USER_AGENT_GIT autolearn=unavailable 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 A732AC38A2A for ; Fri, 8 May 2020 13:21:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 77CE224987 for ; Fri, 8 May 2020 13:21:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588944064; bh=9qbft4kDNoCKCrZE+chhA1A4VuP0bMF+RQz7OOYlRIM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Y/YH1C7d/MANxXbd1pPeCIB+W34Ls/bU+Tee9Z9DcB+d3XGFz5DByikH7abJrpNGA Ph29IOnca83pSyXjfXDuPNAH1ofSUgXJZD5NASRSq9elRyh5rskO+IWpubM5yPtDMj b3I6bDm3dIMCe9Eeiy/LH41Mrb1PHOR3UVKCbcdo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730539AbgEHNVC (ORCPT ); Fri, 8 May 2020 09:21:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:34542 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727786AbgEHMkk (ORCPT ); Fri, 8 May 2020 08:40:40 -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 2586F20731; Fri, 8 May 2020 12:40:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588941640; bh=9qbft4kDNoCKCrZE+chhA1A4VuP0bMF+RQz7OOYlRIM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uIqY6XCpP3YqE+13sfl3YHo7BCOzxRIRWDgrvl4w1Fqcc5kQCkklGSO2cySPzad6z ELIHLvNLb7sz7nsdxIG7/gGd0DJisE0yzoVT5+YRqjdRyrK4//PORZVhusk6P2tYCx p57/2egAn/Y7+4Ym0hBSWke/+UB6c6pJfYKpvcog= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sven Eckelmann , Marek Lindner , Antonio Quartulli Subject: [PATCH 4.4 114/312] batman-adv: Fix lockdep annotation of batadv_tlv_container_remove Date: Fri, 8 May 2020 14:31:45 +0200 Message-Id: <20200508123132.495114406@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200508123124.574959822@linuxfoundation.org> References: <20200508123124.574959822@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 From: Sven Eckelmann commit 008a374487070a391c12aa39288fd8511f822cab upstream. The function handles tlv containers and not tlv handlers. Thus the lockdep_assert_held has to check for the container_list lock. Fixes: 2c72d655b044 ("batman-adv: Annotate deleting functions with external lock via lockdep") Signed-off-by: Sven Eckelmann Signed-off-by: Marek Lindner Signed-off-by: Antonio Quartulli Signed-off-by: Greg Kroah-Hartman --- net/batman-adv/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -747,7 +747,7 @@ static u16 batadv_tvlv_container_list_si static void batadv_tvlv_container_remove(struct batadv_priv *bat_priv, struct batadv_tvlv_container *tvlv) { - lockdep_assert_held(&bat_priv->tvlv.handler_list_lock); + lockdep_assert_held(&bat_priv->tvlv.container_list_lock); if (!tvlv) return;