tpm: Begin the process to deprecate user_read_timer

jgunthorpe · Jarkko Sakkinen · commit fa2825da6f5d · 2017-02-03T22:03:14.000+02:00
For a long time the cdev read/write interface had this strange
idea that userspace had to read the result within 60 seconds otherwise
it is discarded. Perhaps this made sense under some older locking regime,
but in the modern kernel it is not required and is just dangerous.

Since something may be relying on this, double the timeout and print a
warning. We can remove the code in a few years, but this should be
enough to prevent new users.

Suggested-by: James Bottomley &lt;James.Bottomley@HansenPartnership.com&gt;
Signed-off-by: Jason Gunthorpe &lt;jgunthorpe@obsidianresearch.com&gt;
Reviewed-by: Jarkko Sakkinen &lt;jarkko.sakkinen@linux.intel.com&gt;
Signed-off-by: Jarkko Sakkinen &lt;jarkko.sakkinen@linux.intel.com&gt;
diff --git a/drivers/char/tpm/tpm-dev.c b/drivers/char/tpm/tpm-dev.c
@@ -38,6 +38,9 @@ static void user_reader_timeout(unsigned long ptr)
 {
 	struct file_priv *priv = (struct file_priv *)ptr;
 
+	pr_warn("TPM user space timeout is deprecated (pid=%d)\n",
+		task_tgid_nr(current));
+
 	schedule_work(&priv->work);
 }
 
@@ -157,7 +160,7 @@ static ssize_t tpm_write(struct file *file, const char __user *buf,
 	mutex_unlock(&priv->buffer_mutex);
 
 	/* Set a timeout by which the reader must come claim the result */
-	mod_timer(&priv->user_read_timer, jiffies + (60 * HZ));
+	mod_timer(&priv->user_read_timer, jiffies + (120 * HZ));
 
 	return in_size;
 }

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,9 @@ static void user_reader_timeout(unsigned long ptr)`
`38`	`38`	`{`
`39`	`39`	`struct file_priv priv = (struct file_priv )ptr;`
`40`	`40`
	`41`	`+ pr_warn("TPM user space timeout is deprecated (pid=%d)\n",`
	`42`	`+ task_tgid_nr(current));`
	`43`	`+`
`41`	`44`	`schedule_work(&priv->work);`
`42`	`45`	`}`
`43`	`46`
`@@ -157,7 +160,7 @@ static ssize_t tpm_write(struct file file, const char __user buf,`
`157`	`160`	`mutex_unlock(&priv->buffer_mutex);`
`158`	`161`
`159`	`162`	`/* Set a timeout by which the reader must come claim the result */`
`160`		`- mod_timer(&priv->user_read_timer, jiffies + (60 * HZ));`
	`163`	`+ mod_timer(&priv->user_read_timer, jiffies + (120 * HZ));`
`161`	`164`
`162`	`165`	`return in_size;`
`163`	`166`	`}`