aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pps/kapi.c
diff options
context:
space:
mode:
authorAlexander Gordeev <lasaine@lvk.cs.msu.su>2011-01-12 20:00:50 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-13 11:03:19 -0500
commit3003d55b59aa98aeaff2773df69732b27c0cbf6a (patch)
treed7fbadca22907cb90b9e94b283bf8abe6d508c73 /drivers/pps/kapi.c
parent86d921f9ec06bc3fd357a77877d37a604d5674c3 (diff)
pps: fix race in PPS_FETCH handler
There was a race in PPS_FETCH ioctl handler when several processes want to obtain PPS data simultaneously using sleeping PPS_FETCH. They all sleep most of the time in the system call. With the old approach when the first process waiting on the pps queue is waken up it makes new system call right away and zeroes pps->go. So other processes continue to sleep. This is a clear race condition because of the global 'go' variable. With the new approach pps->last_ev holds some value increasing at each PPS event. PPS_FETCH ioctl handler saves current value to the local variable at the very beginning so it can safely check that there is a new event by just comparing both variables. Signed-off-by: Alexander Gordeev <lasaine@lvk.cs.msu.su> Acked-by: Rodolfo Giometti <giometti@linux.it> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/pps/kapi.c')
-rw-r--r--drivers/pps/kapi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pps/kapi.c b/drivers/pps/kapi.c
index 55f39618261b..3f89f5eba81c 100644
--- a/drivers/pps/kapi.c
+++ b/drivers/pps/kapi.c
@@ -326,8 +326,8 @@ void pps_event(int source, struct pps_ktime *ts, int event, void *data)
326 326
327 /* Wake up if captured something */ 327 /* Wake up if captured something */
328 if (captured) { 328 if (captured) {
329 pps->go = ~0; 329 pps->last_ev++;
330 wake_up_interruptible(&pps->queue); 330 wake_up_interruptible_all(&pps->queue);
331 331
332 kill_fasync(&pps->async_queue, SIGIO, POLL_IN); 332 kill_fasync(&pps->async_queue, SIGIO, POLL_IN);
333 } 333 }