Skip to contentSkip to conversation

FAILED: patch "[PATCH] tpm/tpm_i2c_atmel: Return -E2BIG when the transfer is" failed to apply to 4.14-stable tree

PATCH [email protected] 2 participants 4 messages Mar 21, 2019 – Apr 19, 2019

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.14-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 <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 442601e87a4769a8daba4976ec3afa5222ca211d Mon Sep 17 00:00:00 2001
From: Jarkko Sakkinen <[email protected]>
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.

Fixes a2871c62e186 ("tpm: Add support for Atmel I2C TPMs")
drivers/char/tpm/tpm_i2c_atmel.c +4 -0
index 32a8e27c5382..cc4e642d3180 100644
@@ -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;
 }
 
#1 lore raw
Quoted 9 lines · On Thu, Mar 21, 2019 at 11:16:21AM +0100, [email protected] wrote:

The patch below does not apply to the 4.14-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 <[email protected]>.

thanks,

greg k-h

Tried to apply over v4.4.112. It applies and compiles. Also this driver is fairly static because it is used only with legacy hardware so you would not expect any merge conflicts with it.

/Jrakko

author maintainer
#2 lore raw
Quoted 7 lines · Jarkko Sakkinen
Quoted 6 lines · On Thu, Mar 21, 2019 at 11:16:21AM +0100, [email protected] wrote:

The patch below does not apply to the 4.14-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 <[email protected]>.

Quoted 7 lines
Quoted 3 lines

thanks,

greg k-h

Tried to apply over v4.4.112. It applies and compiles. Also this driver is fairly static because it is used only with legacy hardware so you would not expect any merge conflicts with it.

It doesn't apply to 4.4 for me:

~/linux/stable/linux-4.4.y $ patch -p1 --dry-run < ../tpm-tpm_i2c_atmel-return-e2big-when-the-transfer-is-incomplete.patch checking file drivers/char/tpm/tpm_i2c_atmel.c
Hunk #1 FAILED at 69.
1 out of 1 hunk FAILED

So something must have changed :(

Care to provide a working backport?

thanks,

greg k-h

#3 lore raw
Quoted 18 lines · Greg KH
Quoted 7 lines · Jarkko Sakkinen
Quoted 6 lines · On Thu, Mar 21, 2019 at 11:16:21AM +0100, [email protected] wrote:

The patch below does not apply to the 4.14-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 <[email protected]>.

Quoted 7 lines
Quoted 3 lines

thanks,

greg k-h

Tried to apply over v4.4.112. It applies and compiles. Also this driver is fairly static because it is used only with legacy hardware so you would not expect any merge conflicts with it.

It doesn't apply to 4.4 for me:

Quoted 8 lines

~/linux/stable/linux-4.4.y $ patch -p1 --dry-run < ../tpm-tpm_i2c_atmel-return-e2big-when-the-transfer-is-incomplete.patch checking file drivers/char/tpm/tpm_i2c_atmel.c
Hunk #1 FAILED at 69.
1 out of 1 hunk FAILED

So something must have changed :(

Care to provide a working backport?

Sure (like I always do). On leave next week but after that.

/Jarkko