malhuda/msm-4.14
1
0
Fork 0
mirror of https://github.com/rd-stuffs/msm-4.14.git synced 2025-02-20 11:45:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

wan: cosa: replace current->state by set_current_state()

Browse Source 
Use helper functions to access current->state.
Direct assignments are prone to races and therefore buggy.

current->state = TASK_RUNNING is replaced by __set_current_state()

Thanks to Peter Zijlstra for the exact definition of the problem.

Suggested-By: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Acked-By: Jan "Yenya" Kasprzak <kas@fi.muni.cz>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Fabian Frederick 2015-02-20 19:12:56 +01:00 committed by David S. Miller
parent 50462ce005
commit 2c45015a66
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/net/wan/cosa.c
View File

@ -806,21 +806,21 @@ static ssize_t cosa_read(struct file *file,
spin_lock_irqsave(&cosa->lock, flags); spin_lock_irqsave(&cosa->lock, flags);
add_wait_queue(&chan->rxwaitq, &wait); add_wait_queue(&chan->rxwaitq, &wait);
while (!chan->rx_status) { while (!chan->rx_status) {
current->state = TASK_INTERRUPTIBLE; set_current_state(TASK_INTERRUPTIBLE);
spin_unlock_irqrestore(&cosa->lock, flags); spin_unlock_irqrestore(&cosa->lock, flags);
schedule(); schedule();
spin_lock_irqsave(&cosa->lock, flags); spin_lock_irqsave(&cosa->lock, flags);
if (signal_pending(current) && chan->rx_status == 0) { if (signal_pending(current) && chan->rx_status == 0) {
chan->rx_status = 1; chan->rx_status = 1;
remove_wait_queue(&chan->rxwaitq, &wait); remove_wait_queue(&chan->rxwaitq, &wait);
current->state = TASK_RUNNING; __set_current_state(TASK_RUNNING);
spin_unlock_irqrestore(&cosa->lock, flags); spin_unlock_irqrestore(&cosa->lock, flags);
mutex_unlock(&chan->rlock); mutex_unlock(&chan->rlock);
return -ERESTARTSYS; return -ERESTARTSYS;
} }
} }
remove_wait_queue(&chan->rxwaitq, &wait); remove_wait_queue(&chan->rxwaitq, &wait);
current->state = TASK_RUNNING; __set_current_state(TASK_RUNNING);
kbuf = chan->rxdata; kbuf = chan->rxdata;
count = chan->rxsize; count = chan->rxsize;
spin_unlock_irqrestore(&cosa->lock, flags); spin_unlock_irqrestore(&cosa->lock, flags);
@ -890,14 +890,14 @@ static ssize_t cosa_write(struct file *file,
spin_lock_irqsave(&cosa->lock, flags); spin_lock_irqsave(&cosa->lock, flags);
add_wait_queue(&chan->txwaitq, &wait); add_wait_queue(&chan->txwaitq, &wait);
while (!chan->tx_status) { while (!chan->tx_status) {
current->state = TASK_INTERRUPTIBLE; set_current_state(TASK_INTERRUPTIBLE);
spin_unlock_irqrestore(&cosa->lock, flags); spin_unlock_irqrestore(&cosa->lock, flags);
schedule(); schedule();
spin_lock_irqsave(&cosa->lock, flags); spin_lock_irqsave(&cosa->lock, flags);
if (signal_pending(current) && chan->tx_status == 0) { if (signal_pending(current) && chan->tx_status == 0) {
chan->tx_status = 1; chan->tx_status = 1;
remove_wait_queue(&chan->txwaitq, &wait); remove_wait_queue(&chan->txwaitq, &wait);
current->state = TASK_RUNNING; __set_current_state(TASK_RUNNING);
chan->tx_status = 1; chan->tx_status = 1;
spin_unlock_irqrestore(&cosa->lock, flags); spin_unlock_irqrestore(&cosa->lock, flags);
up(&chan->wsem); up(&chan->wsem);
@ -905,7 +905,7 @@ static ssize_t cosa_write(struct file *file,
} }
} }
remove_wait_queue(&chan->txwaitq, &wait); remove_wait_queue(&chan->txwaitq, &wait);
current->state = TASK_RUNNING; __set_current_state(TASK_RUNNING);
up(&chan->wsem); up(&chan->wsem);
spin_unlock_irqrestore(&cosa->lock, flags); spin_unlock_irqrestore(&cosa->lock, flags);
kfree(kbuf); kfree(kbuf);