aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOleg Nesterov <oleg@redhat.com>2015-07-08 21:42:11 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-10-01 12:07:35 +0200
commitf85eee641c7a3bb928a4b605db632c2e90b9574f (patch)
tree009382ffe5c9d3bf8066355f2ce62387149bea6b
parent7865ece30f06072ea61f7db2ebbe24b632800e17 (diff)
downloadlinux-linaro-stable-f85eee641c7a3bb928a4b605db632c2e90b9574f.tar.gz
net: pktgen: fix race between pktgen_thread_worker() and kthread_stop()
[ Upstream commit fecdf8be2d91e04b0a9a4f79ff06499a36f5d14f ] pktgen_thread_worker() is obviously racy, kthread_stop() can come between the kthread_should_stop() check and set_current_state(). Signed-off-by: Oleg Nesterov <oleg@redhat.com> Reported-by: Jan Stancek <jstancek@redhat.com> Reported-by: Marcelo Leitner <mleitner@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--net/core/pktgen.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index ebbea5371967..21a23d97e99c 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -3377,8 +3377,10 @@ static int pktgen_thread_worker(void *arg)
pktgen_rem_thread(t);
/* Wait for kthread_stop */
- while (!kthread_should_stop()) {
+ for (;;) {
set_current_state(TASK_INTERRUPTIBLE);
+ if (kthread_should_stop())
+ break;
schedule();
}
__set_current_state(TASK_RUNNING);