FAILED: patch "[PATCH] tpm: remove invalid min length check from tpm_do_selftest()" failed to apply to 4.8-stable tree

FAILED: patch "[PATCH] tpm: remove invalid min length check from tpm_do_selftest()" failed to apply to 4.8-stable tree

[gregkh]

The patch below does not apply to the 4.8-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 befd99656c5eb765fe9d96045c4cba099fd938db Mon Sep 17 00:00:00 2001
From: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Date: Tue, 4 Oct 2016 09:49:47 +0300
Subject: [PATCH] tpm: remove invalid min length check from tpm_do_selftest()

Removal of this check was not properly amended to the original commit.

Cc: stable@vger.kernel.org
Fixes: 0c541332231e ("tpm: use tpm_pcr_read_dev() in tpm_do_selftest()")
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: James Morris <james.l.morris@oracle.com>

diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c
index 8de61876f633..3a9149cf0110 100644
--- a/drivers/char/tpm/tpm-interface.c
+++ b/drivers/char/tpm/tpm-interface.c
@@ -813,9 +813,6 @@ int tpm_do_selftest(struct tpm_chip *chip)
 			continue;
 		}
 
-		if (rc < TPM_HEADER_SIZE)
-			return -EFAULT;
-
 		if (rc == TPM_ERR_DISABLED || rc == TPM_ERR_DEACTIVATED) {
 			dev_info(&chip->dev,
 				 "TPM is disabled/deactivated (0x%X)\n", rc);

Re: FAILED: patch "[PATCH] tpm: remove invalid min length check from tpm_do_selftest()" failed to apply to 4.8-stable tree

[Jarkko Sakkinen]

Hi

This is needed only for 4.9.

BR
/Jarkko

On Tue, Nov 08, 2016 at 05:18:29PM +0100, gregkh@linuxfoundation.org wrote:
> 
> The patch below does not apply to the 4.8-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 befd99656c5eb765fe9d96045c4cba099fd938db Mon Sep 17 00:00:00 2001
> From: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
> Date: Tue, 4 Oct 2016 09:49:47 +0300
> Subject: [PATCH] tpm: remove invalid min length check from tpm_do_selftest()
> 
> Removal of this check was not properly amended to the original commit.
> 
> Cc: stable@vger.kernel.org
> Fixes: 0c541332231e ("tpm: use tpm_pcr_read_dev() in tpm_do_selftest()")
> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
> Signed-off-by: James Morris <james.l.morris@oracle.com>
> 
> diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c
> index 8de61876f633..3a9149cf0110 100644
> --- a/drivers/char/tpm/tpm-interface.c
> +++ b/drivers/char/tpm/tpm-interface.c
> @@ -813,9 +813,6 @@ int tpm_do_selftest(struct tpm_chip *chip)
>  			continue;
>  		}
>  
> -		if (rc < TPM_HEADER_SIZE)
> -			return -EFAULT;
> -
>  		if (rc == TPM_ERR_DISABLED || rc == TPM_ERR_DEACTIVATED) {
>  			dev_info(&chip->dev,
>  				 "TPM is disabled/deactivated (0x%X)\n", rc);
> 

Re: FAILED: patch "[PATCH] tpm: remove invalid min length check from tpm_do_selftest()" failed to apply to 4.8-stable tree

[Jarkko Sakkinen]

Adding stable@vger.kernel.org to this patch was human error from my
side. Sorry about that.

/Jarkko


On Tue, Nov 08, 2016 at 03:28:06PM -0800, Jarkko Sakkinen wrote:
> Hi
> 
> This is needed only for 4.9.
> 
> BR
> /Jarkko
> 
> On Tue, Nov 08, 2016 at 05:18:29PM +0100, gregkh@linuxfoundation.org wrote:
> > 
> > The patch below does not apply to the 4.8-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 befd99656c5eb765fe9d96045c4cba099fd938db Mon Sep 17 00:00:00 2001
> > From: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
> > Date: Tue, 4 Oct 2016 09:49:47 +0300
> > Subject: [PATCH] tpm: remove invalid min length check from tpm_do_selftest()
> > 
> > Removal of this check was not properly amended to the original commit.
> > 
> > Cc: stable@vger.kernel.org
> > Fixes: 0c541332231e ("tpm: use tpm_pcr_read_dev() in tpm_do_selftest()")
> > Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
> > Signed-off-by: James Morris <james.l.morris@oracle.com>
> > 
> > diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c
> > index 8de61876f633..3a9149cf0110 100644
> > --- a/drivers/char/tpm/tpm-interface.c
> > +++ b/drivers/char/tpm/tpm-interface.c
> > @@ -813,9 +813,6 @@ int tpm_do_selftest(struct tpm_chip *chip)
> >  			continue;
> >  		}
> >  
> > -		if (rc < TPM_HEADER_SIZE)
> > -			return -EFAULT;
> > -
> >  		if (rc == TPM_ERR_DISABLED || rc == TPM_ERR_DEACTIVATED) {
> >  			dev_info(&chip->dev,
> >  				 "TPM is disabled/deactivated (0x%X)\n", rc);
> >