4.14-stable patches

added patches:
	tpm-fix-error-return-code-in-tpm2_get_cc_attrs_tbl.patch

diff --git a/queue-4.14/series b/queue-4.14/series
index afb42ec0b155992f8145552faba85c0f1a2d82ca..c54b73f449d429ce2b51c98122e4334c9384e75d 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -230,3 +230,4 @@ revert-net-sctp-fix-race-condition-in-sctp_destroy_sock.patch
 sctp-delay-auto_asconf-init-until-binding-the-first-addr.patch
 revert-of-fdt-make-sure-no-map-does-not-remove-already-reserved-regions.patch
 revert-fdt-properly-handle-no-map-field-in-the-memory-region.patch
+tpm-fix-error-return-code-in-tpm2_get_cc_attrs_tbl.patch

diff --git a/queue-4.14/tpm-fix-error-return-code-in-tpm2_get_cc_attrs_tbl.patch b/queue-4.14/tpm-fix-error-return-code-in-tpm2_get_cc_attrs_tbl.patch
new file mode 100644 (file)
index 0000000..5e53a98
--- /dev/null
+++ b/queue-4.14/tpm-fix-error-return-code-in-tpm2_get_cc_attrs_tbl.patch
@@ -0,0 +1,36 @@
+From 1df83992d977355177810c2b711afc30546c81ce Mon Sep 17 00:00:00 2001
+From: Zhen Lei <thunder.leizhen@huawei.com>
+Date: Wed, 12 May 2021 21:39:26 +0800
+Subject: tpm: fix error return code in tpm2_get_cc_attrs_tbl()
+
+From: Zhen Lei <thunder.leizhen@huawei.com>
+
+commit 1df83992d977355177810c2b711afc30546c81ce upstream.
+
+If the total number of commands queried through TPM2_CAP_COMMANDS is
+different from that queried through TPM2_CC_GET_CAPABILITY, it indicates
+an unknown error. In this case, an appropriate error code -EFAULT should
+be returned. However, we currently do not explicitly assign this error
+code to 'rc'. As a result, 0 was incorrectly returned.
+
+Cc: stable@vger.kernel.org
+Fixes: 58472f5cd4f6("tpm: validate TPM 2.0 commands")
+Reported-by: Hulk Robot <hulkci@huawei.com>
+Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
+Reviewed-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/tpm2-cmd.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/char/tpm/tpm2-cmd.c
++++ b/drivers/char/tpm/tpm2-cmd.c
+@@ -1051,6 +1051,7 @@ static int tpm2_get_cc_attrs_tbl(struct
+ 
+       if (nr_commands !=
+           be32_to_cpup((__be32 *)&buf.data[TPM_HEADER_SIZE + 5])) {
++              rc = -EFAULT;
+               tpm_buf_destroy(&buf);
+               goto out;
+       }

diff --git a/queue-4.19/series b/queue-4.19/series
index 2cfd78a91871f47c999666a28a332e7505a2f69a..0b835a7a299db2fd52ac868da6eb304dc1b3000f 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -299,3 +299,4 @@ revert-net-sctp-fix-race-condition-in-sctp_destroy_sock.patch
 sctp-delay-auto_asconf-init-until-binding-the-first-addr.patch
 revert-of-fdt-make-sure-no-map-does-not-remove-already-reserved-regions.patch
 revert-fdt-properly-handle-no-map-field-in-the-memory-region.patch
+tpm-fix-error-return-code-in-tpm2_get_cc_attrs_tbl.patch

diff --git a/queue-5.10/series b/queue-5.10/series
new file mode 100644 (file)
index 0000000..2acbcdb
--- /dev/null
+++ b/queue-5.10/series
@@ -0,0 +1,4 @@
+keys-trusted-fix-memory-leak-on-object-td.patch
+tpm-fix-error-return-code-in-tpm2_get_cc_attrs_tbl.patch
+tpm-tpm_tis-extend-locality-handling-to-tpm2-in-tpm_tis_gen_interrupt.patch
+tpm-tpm_tis-reserve-locality-in-tpm_tis_resume.patch

diff --git a/queue-5.11/series b/queue-5.11/series
new file mode 100644 (file)
index 0000000..2acbcdb
--- /dev/null
+++ b/queue-5.11/series
@@ -0,0 +1,4 @@
+keys-trusted-fix-memory-leak-on-object-td.patch
+tpm-fix-error-return-code-in-tpm2_get_cc_attrs_tbl.patch
+tpm-tpm_tis-extend-locality-handling-to-tpm2-in-tpm_tis_gen_interrupt.patch
+tpm-tpm_tis-reserve-locality-in-tpm_tis_resume.patch

diff --git a/queue-5.12/series b/queue-5.12/series
new file mode 100644 (file)
index 0000000..d539a7c
--- /dev/null
+++ b/queue-5.12/series
@@ -0,0 +1,5 @@
+keys-trusted-fix-memory-leak-on-object-td.patch
+tpm-fix-error-return-code-in-tpm2_get_cc_attrs_tbl.patch
+tpm-tpm_tis-extend-locality-handling-to-tpm2-in-tpm_tis_gen_interrupt.patch
+tpm-tpm_tis-reserve-locality-in-tpm_tis_resume.patch
+btrfs-fix-unmountable-seed-device-after-fstrim.patch

diff --git a/queue-5.4/series b/queue-5.4/series
new file mode 100644 (file)
index 0000000..39e981e
--- /dev/null
+++ b/queue-5.4/series
@@ -0,0 +1,3 @@
+tpm-fix-error-return-code-in-tpm2_get_cc_attrs_tbl.patch
+tpm-tpm_tis-extend-locality-handling-to-tpm2-in-tpm_tis_gen_interrupt.patch
+tpm-tpm_tis-reserve-locality-in-tpm_tis_resume.patch