Commit 09b71a58 authored by Jarkko Sakkinen's avatar Jarkko Sakkinen
Browse files

KEYS: trusted: Use tpm_ret_to_err() in trusted_tpm2 



Use tpm_ret_to_err() to transmute TPM return codes in trusted_tpm2.

Signed-off-by: default avatarJarkko Sakkinen <jarkko.sakkinen@opinsys.com>
Acked-by: default avatarStefano Garzarella <sgarzare@redhat.com>
Signed-off-by: default avatarJarkko Sakkinen <jarkko@kernel.org>
parent 7fcf459a

security/keys/trusted-keys/trusted_tpm2.c

+7 −19
Original line number Diff line number Diff line
@@ -333,25 +333,19 @@ int tpm2_seal_trusted(struct tpm_chip *chip, 
	}



	blob_len = tpm2_key_encode(payload, options, &buf.data[offset], blob_len);

	if (blob_len < 0)

		rc = blob_len;



out:

	tpm_buf_destroy(&sized);

	tpm_buf_destroy(&buf);



	if (rc > 0) {

		if (tpm2_rc_value(rc) == TPM2_RC_HASH)

			rc = -EINVAL;

		else

			rc = -EPERM;

	}

	if (blob_len < 0)

		rc = blob_len;

	else

	if (!rc)

		payload->blob_len = blob_len;



out_put:

	tpm_put_ops(chip);

	return rc;

	return tpm_ret_to_err(rc);

}



/**
@@ -455,10 +449,7 @@ static int tpm2_load_cmd(struct tpm_chip *chip, 
out:

	tpm_buf_destroy(&buf);



	if (rc > 0)

		rc = -EPERM;



	return rc;

	return tpm_ret_to_err(rc);

}



/**
@@ -521,8 +512,6 @@ static int tpm2_unseal_cmd(struct tpm_chip *chip, 
	tpm_buf_fill_hmac_session(chip, &buf);

	rc = tpm_transmit_cmd(chip, &buf, 6, "unsealing");

	rc = tpm_buf_check_hmac_response(chip, &buf, rc);

	if (rc > 0)

		rc = -EPERM;



	if (!rc) {

		data_len = be16_to_cpup(
@@ -555,7 +544,7 @@ static int tpm2_unseal_cmd(struct tpm_chip *chip, 


out:

	tpm_buf_destroy(&buf);

	return rc;

	return tpm_ret_to_err(rc);

}



/**
@@ -587,6 +576,5 @@ int tpm2_unseal_trusted(struct tpm_chip *chip, 


out:

	tpm_put_ops(chip);



	return rc;

	return tpm_ret_to_err(rc);

}