From: sjur.brandeland@stericsson.com Date: Wed, 1 Jun 2011 00:55:37 +0000 (+0000) Subject: caif: Fix race when conditionally taking rtnl lock X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=41be5a4a3668810bf3687a76c2b017bd437039e0;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git caif: Fix race when conditionally taking rtnl lock Take the RTNL lock unconditionally when calling dev_close. Taking the lock conditionally may cause race conditions. Signed-off-by: Sjur Brændeland Signed-off-by: David S. Miller --- diff --git a/net/caif/chnl_net.c b/net/caif/chnl_net.c index 649ebacaf6bc..adbb424403d4 100644 --- a/net/caif/chnl_net.c +++ b/net/caif/chnl_net.c @@ -139,17 +139,14 @@ static void close_work(struct work_struct *work) struct chnl_net *dev = NULL; struct list_head *list_node; struct list_head *_tmp; - /* May be called with or without RTNL lock held */ - int islocked = rtnl_is_locked(); - if (!islocked) - rtnl_lock(); + + rtnl_lock(); list_for_each_safe(list_node, _tmp, &chnl_net_list) { dev = list_entry(list_node, struct chnl_net, list_field); if (dev->state == CAIF_SHUTDOWN) dev_close(dev->netdev); } - if (!islocked) - rtnl_unlock(); + rtnl_unlock(); } static DECLARE_WORK(close_worker, close_work);