The patch below does not apply to the 5.0-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to stable@vger.kernel.org.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 442601e87a4769a8daba4976ec3afa5222ca211d Mon Sep 17 00:00:00 2001
From: Jarkko Sakkinen jarkko.sakkinen@linux.intel.com Date: Fri, 8 Feb 2019 18:30:59 +0200 Subject: [PATCH] tpm/tpm_i2c_atmel: Return -E2BIG when the transfer is incomplete
Return -E2BIG when the transfer is incomplete. The upper layer does not retry, so not doing that is incorrect behaviour.
Cc: stable@vger.kernel.org Fixes: a2871c62e186 ("tpm: Add support for Atmel I2C TPMs") Signed-off-by: Jarkko Sakkinen jarkko.sakkinen@linux.intel.com Reviewed-by: Stefan Berger stefanb@linux.ibm.com Reviewed-by: Jerry Snitselaar jsnitsel@redhat.com
diff --git a/drivers/char/tpm/tpm_i2c_atmel.c b/drivers/char/tpm/tpm_i2c_atmel.c index 32a8e27c5382..cc4e642d3180 100644 --- a/drivers/char/tpm/tpm_i2c_atmel.c +++ b/drivers/char/tpm/tpm_i2c_atmel.c @@ -69,6 +69,10 @@ static int i2c_atmel_send(struct tpm_chip *chip, u8 *buf, size_t len) if (status < 0) return status;
+ /* The upper layer does not support incomplete sends. */ + if (status != len) + return -E2BIG; + return 0; }
On Thu, Mar 21, 2019 at 11:16:19AM +0100, gregkh@linuxfoundation.org wrote:
The patch below does not apply to the 5.0-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to stable@vger.kernel.org.
thanks,
greg k-h
I responded to wrong email. This applies to v5.0:
$ git checkout v5.0.8 Checking out files: 100% (52753/52753), done. Previous HEAD position was 6f7da290413b Linux 4.12 HEAD is now at 0b9132ee7429 Linux 5.0.8
$ git am -3 ~/Desktop/0001-tpm-tpm_i2c_atmel-Return-E2BIG-when-the-transfer-is-.patch Applying: tpm/tpm_i2c_atmel: Return -E2BIG when the transfer is incomplete
For me v4.4, yes there is a clear merge conflict.
/Jarkko
linux-stable-mirror@lists.linaro.org