[B.A.T.M.A.N.] [PATCH v2] batman-adv: Add lockdep assert for container_list_lock

[B.A.T.M.A.N.] [PATCH v2] batman-adv: Add lockdep assert for container_list_lock

[Sven Eckelmann]

The batadv_tvlv_container* functions state in their kernel-doc that they
require tvlv.container_list_lock. Add an assert to automatically detect
when this might have been ignored by the caller.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
v2: remove this from the kref patchset and instead submit it as standalone patch
 net/batman-adv/main.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c
index 19ad0bb..c9b8205 100644
--- a/net/batman-adv/main.c
+++ b/net/batman-adv/main.c
@@ -720,6 +720,8 @@ static struct batadv_tvlv_container
 {
 	struct batadv_tvlv_container *tvlv_tmp, *tvlv = NULL;
 
+	lockdep_assert_held(&bat_priv->tvlv.container_list_lock);
+
 	hlist_for_each_entry(tvlv_tmp, &bat_priv->tvlv.container_list, list) {
 		if (tvlv_tmp->tvlv_hdr.type != type)
 			continue;
@@ -752,6 +754,8 @@ static u16 batadv_tvlv_container_list_size(struct batadv_priv *bat_priv)
 	struct batadv_tvlv_container *tvlv;
 	u16 tvlv_len = 0;
 
+	lockdep_assert_held(&bat_priv->tvlv.container_list_lock);
+
 	hlist_for_each_entry(tvlv, &bat_priv->tvlv.container_list, list) {
 		tvlv_len += sizeof(struct batadv_tvlv_hdr);
 		tvlv_len += ntohs(tvlv->tvlv_hdr.len);
-- 
2.6.4

Re: [B.A.T.M.A.N.] [PATCH v2] batman-adv: Add lockdep assert for container_list_lock

[Marek Lindner]

[-- Attachment #1: Type: text/plain, Size: 518 bytes --]

On Sunday, December 20, 2015 09:04:03 Sven Eckelmann wrote:
> The batadv_tvlv_container* functions state in their kernel-doc that they
> require tvlv.container_list_lock. Add an assert to automatically detect
> when this might have been ignored by the caller.
> 
> Signed-off-by: Sven Eckelmann <sven@narfation.org>
> ---
> v2: remove this from the kref patchset and instead submit it as standalone
> patch net/batman-adv/main.c | 4 ++++
>  1 file changed, 4 insertions(+)

Applied in revision 5f01697.

Thanks,
Marek

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 473 bytes --]