tpm: print tpm2_commit_space() error inside tpm2_commit_space() (aff0c20b) · Commits · 戴 / test

The error logging for tpm2_commit_space() is in a wrong place. This commit moves it inside that function. Cc: James Bottomley <James.Bottomley@HansenPartnership.com> Signed-off-by:

Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Reviewed-by:

Stefan Berger <stefanb@linux.ibm.com> Tested-by:

Stefan Berger <stefanb@linux.ibm.com> Reviewed-by:

Jerry Snitselaar <jsnitsel@redhat.com> Reviewed-by:

James Bottomley <James.Bottomley@HansenPartnership.com> Tested-by:

Alexander Steffen <Alexander.Steffen@infineon.com>

drivers/char/tpm/tpm-interface.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -286,8 +286,6 @@ out_recv:
		}

		rc = tpm2_commit_space(chip, space, ordinal, buf, &len);
		if (rc)
		dev_err(&chip->dev, "tpm2_commit_space: error %d\n", rc);

		out:
		/* may fail but do not override previous error value in rc */

drivers/char/tpm/tpm2-space.c

+6 −3

Original line number	Diff line number	Diff line
		@@ -501,19 +501,19 @@ int tpm2_commit_space(struct tpm_chip chip, struct tpm_space space,
		rc = tpm2_map_response_header(chip, cc, buf, *bufsiz);
		if (rc) {
		tpm2_flush_space(chip);
		return rc;
		goto out;
		}

		rc = tpm2_map_response_body(chip, cc, buf, *bufsiz);
		if (rc) {
		tpm2_flush_space(chip);
		return rc;
		goto out;
		}

		rc = tpm2_save_space(chip);
		if (rc) {
		tpm2_flush_space(chip);
		return rc;
		goto out;
		}

		*bufsiz = be32_to_cpu(header->length);
		@@ -526,4 +526,7 @@ int tpm2_commit_space(struct tpm_chip chip, struct tpm_space space,
		memcpy(space->session_buf, chip->work_space.session_buf, PAGE_SIZE);

		return 0;
		out:
		dev_err(&chip->dev, "%s: error %d\n", __func__, rc);
		return rc;
		}

Admin message