summaryrefslogtreecommitdiff
path: root/drivers/ptp
diff options
context:
space:
mode:
authorDan Carpenter <error27@gmail.com>2011-05-29 22:54:07 +0300
committerJohn Stultz <john.stultz@linaro.org>2011-06-01 19:29:10 -0700
commitfb5a18cf7c771a12c3f42a5eb4b476eed68b77cb (patch)
tree99f023f49d8b88918f2ac5c9ce33b956e948b678 /drivers/ptp
parente23ef227d10878ff3f323a1dfed10205a1825b71 (diff)
downloadlinux-3.10-fb5a18cf7c771a12c3f42a5eb4b476eed68b77cb.tar.gz
linux-3.10-fb5a18cf7c771a12c3f42a5eb4b476eed68b77cb.tar.bz2
linux-3.10-fb5a18cf7c771a12c3f42a5eb4b476eed68b77cb.zip
ptp: Fix some locking bugs in ptp_read()
In ptp_read there is an unlock missing on an error path, and a double unlock on another error path. Signed-off-by: Dan Carpenter <error27@gmail.com> Acked-by: Richard Cochran <richard.cochran@omicron.at> Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'drivers/ptp')
-rw-r--r--drivers/ptp/ptp_chardev.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ptp/ptp_chardev.c b/drivers/ptp/ptp_chardev.c
index 93fa22de597..e7f301da290 100644
--- a/drivers/ptp/ptp_chardev.c
+++ b/drivers/ptp/ptp_chardev.c
@@ -130,8 +130,10 @@ ssize_t ptp_read(struct posix_clock *pc,
return -ERESTARTSYS;
}
- if (ptp->defunct)
+ if (ptp->defunct) {
+ mutex_unlock(&ptp->tsevq_mux);
return -ENODEV;
+ }
spin_lock_irqsave(&queue->lock, flags);
@@ -151,10 +153,8 @@ ssize_t ptp_read(struct posix_clock *pc,
mutex_unlock(&ptp->tsevq_mux);
- if (copy_to_user(buf, event, cnt)) {
- mutex_unlock(&ptp->tsevq_mux);
+ if (copy_to_user(buf, event, cnt))
return -EFAULT;
- }
return cnt;
}