Commit 59b69ac2 authored by James Morris's avatar James Morris

Merge branch 'tpmdd-next-v3.6' of git://github.com/shpedoikal/linux into for-linus

parents bb95a0d7 abce9ac2
...@@ -1182,17 +1182,20 @@ ssize_t tpm_write(struct file *file, const char __user *buf, ...@@ -1182,17 +1182,20 @@ ssize_t tpm_write(struct file *file, const char __user *buf,
size_t size, loff_t *off) size_t size, loff_t *off)
{ {
struct tpm_chip *chip = file->private_data; struct tpm_chip *chip = file->private_data;
size_t in_size = size, out_size; size_t in_size = size;
ssize_t out_size;
/* cannot perform a write until the read has cleared /* cannot perform a write until the read has cleared
either via tpm_read or a user_read_timer timeout */ either via tpm_read or a user_read_timer timeout.
while (atomic_read(&chip->data_pending) != 0) This also prevents splitted buffered writes from blocking here.
msleep(TPM_TIMEOUT); */
if (atomic_read(&chip->data_pending) != 0)
mutex_lock(&chip->buffer_mutex); return -EBUSY;
if (in_size > TPM_BUFSIZE) if (in_size > TPM_BUFSIZE)
in_size = TPM_BUFSIZE; return -E2BIG;
mutex_lock(&chip->buffer_mutex);
if (copy_from_user if (copy_from_user
(chip->data_buffer, (void __user *) buf, in_size)) { (chip->data_buffer, (void __user *) buf, in_size)) {
...@@ -1202,6 +1205,10 @@ ssize_t tpm_write(struct file *file, const char __user *buf, ...@@ -1202,6 +1205,10 @@ ssize_t tpm_write(struct file *file, const char __user *buf,
/* atomic tpm command send and result receive */ /* atomic tpm command send and result receive */
out_size = tpm_transmit(chip, chip->data_buffer, TPM_BUFSIZE); out_size = tpm_transmit(chip, chip->data_buffer, TPM_BUFSIZE);
if (out_size < 0) {
mutex_unlock(&chip->buffer_mutex);
return out_size;
}
atomic_set(&chip->data_pending, out_size); atomic_set(&chip->data_pending, out_size);
mutex_unlock(&chip->buffer_mutex); mutex_unlock(&chip->buffer_mutex);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment