Commit-ID: fb5a18cf7c771a12c3f42a5eb4b476eed68b77cb
Gitweb: http://git.kernel.org/tip/fb5a18cf7c771a12c3f42a5eb4b476eed68b77cb
Author: Dan Carpenter <error27@xxxxxxxxx>
AuthorDate: Sun, 29 May 2011 22:54:07 +0300
Committer: John Stultz <john.stultz@xxxxxxxxxx>
CommitDate: Wed, 1 Jun 2011 19:29:10 -0700
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@xxxxxxxxx>
Acked-by: Richard Cochran <richard.cochran@xxxxxxxxxx>
Signed-off-by: John Stultz <john.stultz@xxxxxxxxxx>
---
drivers/ptp/ptp_chardev.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/ptp/ptp_chardev.c b/drivers/ptp/ptp_chardev.c
index 93fa22d..e7f301da2 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;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|