From: Jarek Poplawski <jarkao2@o2.pl>
To: netdev@vger.kernel.org
Cc: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>,
"David S\. Miller" <davem@davemloft.net>,
Herbert Xu <herbert@gondor.apana.org.au>
Subject: [PATCH 1/2][IPV6] addrconf: fix timer deleting on exit
Date: Thu, 5 Jul 2007 13:12:46 +0200 [thread overview]
Message-ID: <20070705111246.GB1569@ff.dom.local> (raw)
It looks like a timer function can be running and rearm
the timer after removing a ipv6 module.
Signed-off-by: Jarek Poplawski <jarkao2@o2.pl>
---
diff -Nurp 2.6.22-rc7-/net/ipv6/addrconf.c 2.6.22-rc7/net/ipv6/addrconf.c
--- 2.6.22-rc7-/net/ipv6/addrconf.c 2007-07-02 09:03:29.000000000 +0200
+++ 2.6.22-rc7/net/ipv6/addrconf.c 2007-07-05 12:27:22.000000000 +0200
@@ -2957,8 +2957,11 @@ restart:
read_unlock(&addrconf_hash_lock);
}
- addr_chk_timer.expires = time_before(next, jiffies + HZ) ? jiffies + HZ : next;
- add_timer(&addr_chk_timer);
+ if (ipv6_dev_notf.notifier_call) { /* exit time? */
+ addr_chk_timer.expires = time_before(next, jiffies + HZ)
+ ? jiffies + HZ : next;
+ add_timer(&addr_chk_timer);
+ }
spin_unlock_bh(&addrconf_verify_lock);
}
@@ -4281,9 +4284,13 @@ void __exit addrconf_cleanup(void)
*/
}
}
+
+ /* now exit flag for a timer... */
+ ipv6_dev_notf.notifier_call = NULL;
write_unlock_bh(&addrconf_hash_lock);
- del_timer(&addr_chk_timer);
+ if (!del_timer_sync(&addr_chk_timer))
+ del_timer_sync(&addr_chk_timer);
rtnl_unlock();
next reply other threads:[~2007-07-05 11:04 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-07-05 11:12 Jarek Poplawski [this message]
2007-07-05 11:37 ` [PATCH 2/2][IPV6] addrconf: fix addrconf_del_timer locking etc Jarek Poplawski
2007-07-05 21:37 ` [PATCH 1/2][IPV6] addrconf: fix timer deleting on exit David Miller
2007-07-06 5:30 ` Jarek Poplawski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070705111246.GB1569@ff.dom.local \
--to=jarkao2@o2.pl \
--cc=davem@davemloft.net \
--cc=herbert@gondor.apana.org.au \
--cc=netdev@vger.kernel.org \
--cc=yoshfuji@linux-ipv6.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).