From: Deepak <deepak_das@mentor.com>
To: davem@davemloft.net, netdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Subject: [RFC] net: Replace del_timer() with del_timer_sync()
Date: Thu, 07 Aug 2014 11:48:47 +0530 [thread overview]
Message-ID: <53E31A47.9000407@mentor.com> (raw)
on SMP system, del_timer() might return even if the timer function
is running on other cpu so sk_stop_timer() will execute __sock_put()
while timer is accessing the socket on other cpu causing
"use-after-free".
This commit replaces del_timer() with del_timer_sync() in
sk_stop_timer().
del_timer_sync() will wait untill the timer function is not running in
any other cpu hence making sk_stop_timer() SMP safe.
Signed-off-by: Deepak Das <deepak_das@mentor.com>
diff --git a/net/core/sock.c b/net/core/sock.c
index 026e01f..491a84d 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -2304,7 +2304,7 @@ EXPORT_SYMBOL(sk_reset_timer);
void sk_stop_timer(struct sock *sk, struct timer_list* timer)
{
- if (del_timer(timer))
+ if (del_timer_sync(timer))
__sock_put(sk);
}
EXPORT_SYMBOL(sk_stop_timer);
next reply other threads:[~2014-08-07 6:18 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-07 6:18 Deepak [this message]
2014-08-07 6:55 ` [RFC] net: Replace del_timer() with del_timer_sync() Eric Dumazet
2014-08-07 15:15 ` Das, Deepak
2014-08-07 16:48 ` Eric Dumazet
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=53E31A47.9000407@mentor.com \
--to=deepak_das@mentor.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.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).