Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be4c9acf authored by Stefan Berger's avatar Stefan Berger Committed by Jarkko Sakkinen
Browse files

tpm: vtpm_proxy: Implement request_locality function. 



Implement the request_locality function. To set the locality on the
backend we define vendor-specific TPM 1.2 and TPM 2 ordinals and send
a command to the backend to set the locality for the next commands.

To avoid recursing into requesting the locality, we set the
TPM_TRANSMIT_RAW flag when calling tpm_transmit_cmd. To avoid recursing
into TPM 2 space related commands, we set the space parameter to NULL.

Signed-off-by: default avatarStefan Berger <stefanb@linux.vnet.ibm.com>
Reviewed-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
parent 85ab3bf3

drivers/char/tpm/tpm-interface.c

+1 −0
Original line number Diff line number Diff line
@@ -538,6 +538,7 @@ ssize_t tpm_transmit_cmd(struct tpm_chip *chip, struct tpm_space *space, 


	return 0;

}

EXPORT_SYMBOL_GPL(tpm_transmit_cmd);



#define TPM_DIGEST_SIZE 20

#define TPM_RET_CODE_IDX 6

drivers/char/tpm/tpm_vtpm_proxy.c

+36 −0
Original line number Diff line number Diff line
@@ -371,6 +371,41 @@ static bool vtpm_proxy_tpm_req_canceled(struct tpm_chip *chip, u8 status) 
	return ret;

}



static int vtpm_proxy_request_locality(struct tpm_chip *chip, int locality)

{

	struct tpm_buf buf;

	int rc;

	const struct tpm_output_header *header;



	if (chip->flags & TPM_CHIP_FLAG_TPM2)

		rc = tpm_buf_init(&buf, TPM2_ST_SESSIONS,

				  TPM2_CC_SET_LOCALITY);

	else

		rc = tpm_buf_init(&buf, TPM_TAG_RQU_COMMAND,

				  TPM_ORD_SET_LOCALITY);

	if (rc)

		return rc;

	tpm_buf_append_u8(&buf, locality);



	rc = tpm_transmit_cmd(chip, NULL, buf.data, tpm_buf_length(&buf), 0,

			      TPM_TRANSMIT_UNLOCKED | TPM_TRANSMIT_RAW,

			      "attempting to set locality");

	if (rc < 0) {

		locality = rc;

		goto out;

	}



	header = (const struct tpm_output_header *)buf.data;

	rc = be32_to_cpu(header->return_code);

	if (rc)

		locality = -1;



out:

	tpm_buf_destroy(&buf);



	return locality;

}



static const struct tpm_class_ops vtpm_proxy_tpm_ops = {

	.flags = TPM_OPS_AUTO_STARTUP,

	.recv = vtpm_proxy_tpm_op_recv,
@@ -380,6 +415,7 @@ static const struct tpm_class_ops vtpm_proxy_tpm_ops = { 
	.req_complete_mask = VTPM_PROXY_REQ_COMPLETE_FLAG,

	.req_complete_val = VTPM_PROXY_REQ_COMPLETE_FLAG,

	.req_canceled = vtpm_proxy_tpm_req_canceled,

	.request_locality = vtpm_proxy_request_locality,

};



/*

include/uapi/linux/vtpm_proxy.h

+4 −0
Original line number Diff line number Diff line
@@ -46,4 +46,8 @@ struct vtpm_proxy_new_dev { 


#define VTPM_PROXY_IOC_NEW_DEV	_IOWR(0xa1, 0x00, struct vtpm_proxy_new_dev)



/* vendor specific commands to set locality */

#define TPM2_CC_SET_LOCALITY	0x20001000

#define TPM_ORD_SET_LOCALITY	0x20001000



#endif /* _UAPI_LINUX_VTPM_PROXY_H */