[PATCH v2] tpm: ibmvtpm: fix error return code in tpm_ibmvtpm_probe()

Subsystems: linux for powerpc (32-bit and 64-bit), the rest, tpm device driver

STALE2014d

4 messages, 3 authors, 2021-01-30 · open the first message on its own page

[PATCH v2] tpm: ibmvtpm: fix error return code in tpm_ibmvtpm_probe()

From: Stefan Berger <hidden>
Date: 2021-01-26 10:37:52

From: Stefan Berger <stefanb@linux.ibm.com>

Return error code -ETIMEDOUT rather than '0' when waiting for the
rtce_buf to be set has timed out.

Fixes: d8d74ea3c002 ("tpm: ibmvtpm: Wait for buffer to be set before proceeding")
Reported-by: Hulk Robot <redacted>
Signed-off-by: Wang Hai <redacted>
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
---
 drivers/char/tpm/tpm_ibmvtpm.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/char/tpm/tpm_ibmvtpm.c b/drivers/char/tpm/tpm_ibmvtpm.c
index 994385bf37c0..813eb2cac0ce 100644
--- a/drivers/char/tpm/tpm_ibmvtpm.c
+++ b/drivers/char/tpm/tpm_ibmvtpm.c

@@ -687,6 +687,7 @@ static int tpm_ibmvtpm_probe(struct vio_dev *vio_dev,
 				ibmvtpm->rtce_buf != NULL,
 				HZ)) {
 		dev_err(dev, "CRQ response timed out\n");
+		rc = -ETIMEDOUT;
 		goto init_irq_cleanup;
 	}

-- 
2.25.4

Re: [PATCH v2] tpm: ibmvtpm: fix error return code in tpm_ibmvtpm_probe()

From: Jarkko Sakkinen <jarkko@kernel.org>
Date: 2021-01-29 17:42:50

On Mon, Jan 25, 2021 at 08:47:53PM -0500, Stefan Berger wrote:

From: Stefan Berger <stefanb@linux.ibm.com>

Return error code -ETIMEDOUT rather than '0' when waiting for the
rtce_buf to be set has timed out.

Fixes: d8d74ea3c002 ("tpm: ibmvtpm: Wait for buffer to be set before proceeding")
Reported-by: Hulk Robot <redacted>
Signed-off-by: Wang Hai <redacted>
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
---

Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>

Thanks! Should I add

Cc: stable@vger.kernel.org to this?

/Jarkko

quoted hunk

 drivers/char/tpm/tpm_ibmvtpm.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/char/tpm/tpm_ibmvtpm.c b/drivers/char/tpm/tpm_ibmvtpm.c
index 994385bf37c0..813eb2cac0ce 100644
--- a/drivers/char/tpm/tpm_ibmvtpm.c
+++ b/drivers/char/tpm/tpm_ibmvtpm.c

@@ -687,6 +687,7 @@ static int tpm_ibmvtpm_probe(struct vio_dev *vio_dev,
 				ibmvtpm->rtce_buf != NULL,
 				HZ)) {
 		dev_err(dev, "CRQ response timed out\n");
+		rc = -ETIMEDOUT;
 		goto init_irq_cleanup;
 	}

-- 
2.25.4

Re: [PATCH v2] tpm: ibmvtpm: fix error return code in tpm_ibmvtpm_probe()

From: Stefan Berger <stefanb@linux.ibm.com>
Date: 2021-01-29 18:59:32

On 1/29/21 12:35 PM, Jarkko Sakkinen wrote:

On Mon, Jan 25, 2021 at 08:47:53PM -0500, Stefan Berger wrote:

quoted

From: Stefan Berger <stefanb@linux.ibm.com>

Return error code -ETIMEDOUT rather than '0' when waiting for the
rtce_buf to be set has timed out.

Fixes: d8d74ea3c002 ("tpm: ibmvtpm: Wait for buffer to be set before proceeding")
Reported-by: Hulk Robot <redacted>
Signed-off-by: Wang Hai <redacted>
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
---

Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>

Thanks! Should I add

Cc: stable@vger.kernel.org to this?

Yes, that would be good! Thank you!


    Stefan

/Jarkko

quoted

  drivers/char/tpm/tpm_ibmvtpm.c | 1 +
  1 file changed, 1 insertion(+)

diff --git a/drivers/char/tpm/tpm_ibmvtpm.c b/drivers/char/tpm/tpm_ibmvtpm.c
index 994385bf37c0..813eb2cac0ce 100644
--- a/drivers/char/tpm/tpm_ibmvtpm.c
+++ b/drivers/char/tpm/tpm_ibmvtpm.c

@@ -687,6 +687,7 @@ static int tpm_ibmvtpm_probe(struct vio_dev *vio_dev,
  				ibmvtpm->rtce_buf != NULL,
  				HZ)) {
  		dev_err(dev, "CRQ response timed out\n");
+		rc = -ETIMEDOUT;
  		goto init_irq_cleanup;
  	}

-- 
2.25.4

Re: [PATCH v2] tpm: ibmvtpm: fix error return code in tpm_ibmvtpm_probe()

From: Jarkko Sakkinen <jarkko@kernel.org>
Date: 2021-01-30 21:15:37

On Fri, 2021-01-29 at 13:57 -0500, Stefan Berger wrote:

On 1/29/21 12:35 PM, Jarkko Sakkinen wrote:

quoted

On Mon, Jan 25, 2021 at 08:47:53PM -0500, Stefan Berger wrote:

quoted

From: Stefan Berger <stefanb@linux.ibm.com>

Return error code -ETIMEDOUT rather than '0' when waiting for the
rtce_buf to be set has timed out.

Fixes: d8d74ea3c002 ("tpm: ibmvtpm: Wait for buffer to be set before proceeding")
Reported-by: Hulk Robot <redacted>
Signed-off-by: Wang Hai <redacted>
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
---

Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>

Thanks! Should I add

Cc: stable@vger.kernel.org to this?

Yes, that would be good! Thank you!


OK, it's applied.

    Stefan

/Jarkko

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help