From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 3 Jun 2022 16:20:54 +0000 (+0200)
Subject: 4.14-stable patches
X-Git-Tag: v4.9.317~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=079c732da1ba63036c3f85571ab5680bd7390099;p=thirdparty%2Fkernel%2Fstable-queue.git

4.14-stable patches

added patches:
	tpm-ibmvtpm-correct-the-return-value-in-tpm_ibmvtpm_probe.patch
---

diff --git a/queue-4.14/series b/queue-4.14/series
index 8b2ef6b485f..f6958af9323 100644
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -17,3 +17,4 @@ dm-integrity-fix-error-code-in-dm_integrity_ctr.patch
 dm-crypt-make-printing-of-the-key-constant-time.patch
 dm-stats-add-cond_resched-when-looping-over-entries.patch
 dm-verity-set-dm_target_immutable-feature-flag.patch
+tpm-ibmvtpm-correct-the-return-value-in-tpm_ibmvtpm_probe.patch
diff --git a/queue-4.14/tpm-ibmvtpm-correct-the-return-value-in-tpm_ibmvtpm_probe.patch b/queue-4.14/tpm-ibmvtpm-correct-the-return-value-in-tpm_ibmvtpm_probe.patch
new file mode 100644
index 00000000000..f61b5687441
--- /dev/null
+++ b/queue-4.14/tpm-ibmvtpm-correct-the-return-value-in-tpm_ibmvtpm_probe.patch
@@ -0,0 +1,32 @@
+From d0dc1a7100f19121f6e7450f9cdda11926aa3838 Mon Sep 17 00:00:00 2001
+From: Xiu Jianfeng <xiujianfeng@huawei.com>
+Date: Fri, 18 Mar 2022 14:02:01 +0800
+Subject: tpm: ibmvtpm: Correct the return value in tpm_ibmvtpm_probe()
+
+From: Xiu Jianfeng <xiujianfeng@huawei.com>
+
+commit d0dc1a7100f19121f6e7450f9cdda11926aa3838 upstream.
+
+Currently it returns zero when CRQ response timed out, it should return
+an error code instead.
+
+Fixes: d8d74ea3c002 ("tpm: ibmvtpm: Wait for buffer to be set before proceeding")
+Signed-off-by: Xiu Jianfeng <xiujianfeng@huawei.com>
+Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
+Acked-by: Jarkko Sakkinen <jarkko@kernel.org>
+Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/char/tpm/tpm_ibmvtpm.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/char/tpm/tpm_ibmvtpm.c
++++ b/drivers/char/tpm/tpm_ibmvtpm.c
+@@ -692,6 +692,7 @@ static int tpm_ibmvtpm_probe(struct vio_
+ 	if (!wait_event_timeout(ibmvtpm->crq_queue.wq,
+ 				ibmvtpm->rtce_buf != NULL,
+ 				HZ)) {
++		rc = -ENODEV;
+ 		dev_err(dev, "CRQ response timed out\n");
+ 		goto init_irq_cleanup;
+ 	}