From: Greg Kroah-Hartman Date: Fri, 14 May 2021 13:44:55 +0000 (+0200) Subject: 4.14-stable patches X-Git-Tag: v5.4.120~107 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e0f2bdfb7f793d2e50fa13012b8fbd28d373d93b;p=thirdparty%2Fkernel%2Fstable-queue.git 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 afb42ec0b15..c54b73f449d 100644 --- 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 index 00000000000..5e53a986413 --- /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 +Date: Wed, 12 May 2021 21:39:26 +0800 +Subject: tpm: fix error return code in tpm2_get_cc_attrs_tbl() + +From: Zhen Lei + +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 +Signed-off-by: Zhen Lei +Reviewed-by: Jarkko Sakkinen +Signed-off-by: Jarkko Sakkinen +Signed-off-by: Greg Kroah-Hartman +--- + 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 2cfd78a9187..0b835a7a299 100644 --- 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 index 00000000000..2acbcdbf6d5 --- /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 index 00000000000..2acbcdbf6d5 --- /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 index 00000000000..d539a7ce055 --- /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 index 00000000000..39e981e9356 --- /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