Commit 3003d55b authored by Alexander Gordeev's avatar Alexander Gordeev Committed by Linus Torvalds
Browse files

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: default avatarAlexander Gordeev <lasaine@lvk.cs.msu.su>
Acked-by: default avatarRodolfo Giometti <giometti@linux.it>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 86d921f9

drivers/pps/kapi.c

+2 −2
Original line number Diff line number Diff line
@@ -326,8 +326,8 @@ void pps_event(int source, struct pps_ktime *ts, int event, void *data) 


	/* Wake up if captured something */

	if (captured) {

		pps->go = ~0;

		wake_up_interruptible(&pps->queue);

		pps->last_ev++;

		wake_up_interruptible_all(&pps->queue);



		kill_fasync(&pps->async_queue, SIGIO, POLL_IN);

	}

drivers/pps/pps.c

+7 −3
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ static long pps_cdev_ioctl(struct file *file, 


	case PPS_FETCH: {

		struct pps_fdata fdata;

		unsigned int ev;



		pr_debug("PPS_FETCH: source %d\n", pps->id);
@@ -143,11 +144,12 @@ static long pps_cdev_ioctl(struct file *file, 
		if (err)

			return -EFAULT;



		pps->go = 0;

		ev = pps->last_ev;



		/* Manage the timeout */

		if (fdata.timeout.flags & PPS_TIME_INVALID)

			err = wait_event_interruptible(pps->queue, pps->go);

			err = wait_event_interruptible(pps->queue,

					ev != pps->last_ev);

		else {

			unsigned long ticks;
@@ -159,7 +161,9 @@ static long pps_cdev_ioctl(struct file *file, 


			if (ticks != 0) {

				err = wait_event_interruptible_timeout(

						pps->queue, pps->go, ticks);

						pps->queue,

						ev != pps->last_ev,

						ticks);

				if (err == 0)

					return -ETIMEDOUT;

			}

include/linux/pps_kernel.h

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ struct pps_device { 
	struct pps_ktime clear_tu;

	int current_mode;			/* PPS mode at event time */



	int go;					/* PPS event is arrived? */

	unsigned int last_ev;			/* last PPS event id */

	wait_queue_head_t queue;		/* PPS event queue */



	unsigned int id;			/* PPS source unique ID */

CRA Git | Maintained and supported by SUSTech CRA and CCSE