summaryrefslogtreecommitdiff
path: root/net
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 11:36:20 +0200
commit45b5e68e764981b1dc69417504bfc2ed9c72b064 (patch)
treeb4141b71d460d512b2f7c5a4e700939136a2852b /net
parentd46c3f82dce0dd99a8ff22e8e45d86abb9683fd5 (diff)
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>
Diffstat (limited to 'net')
-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 ca68d32b49ba..dbd797a62b3a 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -3464,8 +3464,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);