From: Greg Kroah-Hartman Date: Mon, 31 Jul 2023 12:29:34 +0000 (+0200) Subject: fix up tpm patch X-Git-Tag: v5.15.124~59 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ad9f8bf97b3f71e5068528824ff44b98ffe908d;p=thirdparty%2Fkernel%2Fstable-queue.git fix up tpm patch --- diff --git a/queue-4.14/tpm_tis-explicitly-check-for-error-code.patch b/queue-4.14/tpm_tis-explicitly-check-for-error-code.patch index 77e2457c186..9dbb5bfbd6f 100644 --- a/queue-4.14/tpm_tis-explicitly-check-for-error-code.patch +++ b/queue-4.14/tpm_tis-explicitly-check-for-error-code.patch @@ -25,12 +25,20 @@ Reviewed-by: Jarkko Sakkinen Signed-off-by: Jarkko Sakkinen Signed-off-by: Greg Kroah-Hartman --- - drivers/char/tpm/tpm_tis_core.c | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) + drivers/char/tpm/tpm_tis_core.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) --- a/drivers/char/tpm/tpm_tis_core.c +++ b/drivers/char/tpm/tpm_tis_core.c -@@ -228,8 +228,13 @@ static int tpm_tis_recv(struct tpm_chip +@@ -209,6 +209,7 @@ static int tpm_tis_recv(struct tpm_chip + int size = 0; + int status; + u32 expected; ++ int rc; + + if (count < TPM_HEADER_SIZE) { + size = -EIO; +@@ -228,8 +229,13 @@ static int tpm_tis_recv(struct tpm_chip goto out; } diff --git a/queue-4.19/tpm_tis-explicitly-check-for-error-code.patch b/queue-4.19/tpm_tis-explicitly-check-for-error-code.patch index 915b9c72f23..fd6f30da0e9 100644 --- a/queue-4.19/tpm_tis-explicitly-check-for-error-code.patch +++ b/queue-4.19/tpm_tis-explicitly-check-for-error-code.patch @@ -25,12 +25,20 @@ Reviewed-by: Jarkko Sakkinen Signed-off-by: Jarkko Sakkinen Signed-off-by: Greg Kroah-Hartman --- - drivers/char/tpm/tpm_tis_core.c | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) + drivers/char/tpm/tpm_tis_core.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) --- a/drivers/char/tpm/tpm_tis_core.c +++ b/drivers/char/tpm/tpm_tis_core.c -@@ -289,8 +289,13 @@ static int tpm_tis_recv(struct tpm_chip +@@ -270,6 +270,7 @@ static int tpm_tis_recv(struct tpm_chip + int size = 0; + int status; + u32 expected; ++ int rc; + + if (count < TPM_HEADER_SIZE) { + size = -EIO; +@@ -289,8 +290,13 @@ static int tpm_tis_recv(struct tpm_chip goto out; } diff --git a/queue-5.10/tpm_tis-explicitly-check-for-error-code.patch b/queue-5.10/tpm_tis-explicitly-check-for-error-code.patch index c5ea4252b3c..70d2306e2cf 100644 --- a/queue-5.10/tpm_tis-explicitly-check-for-error-code.patch +++ b/queue-5.10/tpm_tis-explicitly-check-for-error-code.patch @@ -25,12 +25,20 @@ Reviewed-by: Jarkko Sakkinen Signed-off-by: Jarkko Sakkinen Signed-off-by: Greg Kroah-Hartman --- - drivers/char/tpm/tpm_tis_core.c | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) + drivers/char/tpm/tpm_tis_core.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) --- a/drivers/char/tpm/tpm_tis_core.c +++ b/drivers/char/tpm/tpm_tis_core.c -@@ -333,8 +333,13 @@ static int tpm_tis_recv(struct tpm_chip +@@ -314,6 +314,7 @@ static int tpm_tis_recv(struct tpm_chip + int size = 0; + int status; + u32 expected; ++ int rc; + + if (count < TPM_HEADER_SIZE) { + size = -EIO; +@@ -333,8 +334,13 @@ static int tpm_tis_recv(struct tpm_chip goto out; } diff --git a/queue-5.15/tpm_tis-explicitly-check-for-error-code.patch b/queue-5.15/tpm_tis-explicitly-check-for-error-code.patch index c5ea4252b3c..70d2306e2cf 100644 --- a/queue-5.15/tpm_tis-explicitly-check-for-error-code.patch +++ b/queue-5.15/tpm_tis-explicitly-check-for-error-code.patch @@ -25,12 +25,20 @@ Reviewed-by: Jarkko Sakkinen Signed-off-by: Jarkko Sakkinen Signed-off-by: Greg Kroah-Hartman --- - drivers/char/tpm/tpm_tis_core.c | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) + drivers/char/tpm/tpm_tis_core.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) --- a/drivers/char/tpm/tpm_tis_core.c +++ b/drivers/char/tpm/tpm_tis_core.c -@@ -333,8 +333,13 @@ static int tpm_tis_recv(struct tpm_chip +@@ -314,6 +314,7 @@ static int tpm_tis_recv(struct tpm_chip + int size = 0; + int status; + u32 expected; ++ int rc; + + if (count < TPM_HEADER_SIZE) { + size = -EIO; +@@ -333,8 +334,13 @@ static int tpm_tis_recv(struct tpm_chip goto out; } diff --git a/queue-5.4/tpm_tis-explicitly-check-for-error-code.patch b/queue-5.4/tpm_tis-explicitly-check-for-error-code.patch index 6f58c05a773..5c461a9b9d5 100644 --- a/queue-5.4/tpm_tis-explicitly-check-for-error-code.patch +++ b/queue-5.4/tpm_tis-explicitly-check-for-error-code.patch @@ -25,12 +25,20 @@ Reviewed-by: Jarkko Sakkinen Signed-off-by: Jarkko Sakkinen Signed-off-by: Greg Kroah-Hartman --- - drivers/char/tpm/tpm_tis_core.c | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) + drivers/char/tpm/tpm_tis_core.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) --- a/drivers/char/tpm/tpm_tis_core.c +++ b/drivers/char/tpm/tpm_tis_core.c -@@ -285,8 +285,13 @@ static int tpm_tis_recv(struct tpm_chip +@@ -266,6 +266,7 @@ static int tpm_tis_recv(struct tpm_chip + int size = 0; + int status; + u32 expected; ++ int rc; + + if (count < TPM_HEADER_SIZE) { + size = -EIO; +@@ -285,8 +286,13 @@ static int tpm_tis_recv(struct tpm_chip goto out; }