TPM: refactoring and integrity
cover TPM: refactoring and integrity
This patchset contains a refactoring patch and integrity one. The first addresses Matt Helsley and Dave Hansen's comments on replacing the data[] vectors by packed structures making the code easier to read and debug and also consolidates most of the tpm_show_* functions. The second one provides an interface to read and extend PCR values, which is widely used by IMA.
This version also addresses Matt Helsley's last observation on the timeout_t structure usage to access TPM_CAP_PROP_TIS_DURATION capability, now a new structure is being used, duration_t, whose fields now match exactly as defined in the TPM specification.
Rajiv Andrade (2):
TPM: sysfs functions consolidation
TPM: integrity interface
drivers/char/tpm/tpm.c | 528 ++++++++++++++++++++++-------------------------- drivers/char/tpm/tpm.h | 142 +++++++++++++ include/linux/tpm.h | 35 ++++ 3 files changed, 423 insertions(+), 282 deletions(-) create mode 100644 include/linux/tpm.h
PATCH 1/2 TPM: sysfs functions consolidation
According to Dave Hansen's comments on the tpm_show_*, some of these functions present a pattern when allocating data[] memory space and also when setting its content. A new function was created so that this pattern could be consolidated. Also, replaced the data[] command vectors and its indexes by meaningful structures as pointed out by Matt Helsley too.
--- drivers/char/tpm/tpm.c | 411 +++++++++++++++++------------------------------- drivers/char/tpm/tpm.h | 124 +++++++++++++++ 2 files changed, 266 insertions(+), 269 deletions(-)
drivers/char/tpm/tpm.c +142 -269
@@ -429,134 +429,148 @@ out:#define TPM_DIGEST_SIZE 20#define TPM_ERROR_SIZE 10#define TPM_RET_CODE_IDX 6 -#define TPM_GET_CAP_RET_SIZE_IDX 10 -#define TPM_GET_CAP_RET_UINT32_1_IDX 14 -#define TPM_GET_CAP_RET_UINT32_2_IDX 18 -#define TPM_GET_CAP_RET_UINT32_3_IDX 22 -#define TPM_GET_CAP_RET_UINT32_4_IDX 26 -#define TPM_GET_CAP_PERM_DISABLE_IDX 16 -#define TPM_GET_CAP_PERM_INACTIVE_IDX 18 -#define TPM_GET_CAP_RET_BOOL_1_IDX 14 -#define TPM_GET_CAP_TEMP_INACTIVE_IDX 16 - -#define TPM_CAP_IDX 13 -#define TPM_CAP_SUBCAP_IDX 21enum tpm_capabilities { -TPM_CAP_FLAG =4 , -TPM_CAP_PROP =5 , +TPM_CAP_FLAG =cpu_to_be32 (4 ), +TPM_CAP_PROP =cpu_to_be32 (5 ), +CAP_VERSION_1_1 =cpu_to_be32 (0x06 ), +CAP_VERSION_1_2 =cpu_to_be32 (0x1A ) };enum tpm_sub_capabilities { -TPM_CAP_PROP_PCR =0x1 , -TPM_CAP_PROP_MANUFACTURER =0x3 , -TPM_CAP_FLAG_PERM =0x8 , -TPM_CAP_FLAG_VOL =0x9 , -TPM_CAP_PROP_OWNER =0x11 , -TPM_CAP_PROP_TIS_TIMEOUT =0x15 , -TPM_CAP_PROP_TIS_DURATION =0x20 , -}; +TPM_CAP_PROP_PCR =cpu_to_be32 (0x101 ), +TPM_CAP_PROP_MANUFACTURER =cpu_to_be32 (0x103 ), +TPM_CAP_FLAG_PERM =cpu_to_be32 (0x108 ), +TPM_CAP_FLAG_VOL =cpu_to_be32 (0x109 ), +TPM_CAP_PROP_OWNER =cpu_to_be32 (0x111 ), +TPM_CAP_PROP_TIS_TIMEOUT =cpu_to_be32 (0x115 ), +TPM_CAP_PROP_TIS_DURATION =cpu_to_be32 (0x120 ), -/* -* This is a semi generic GetCapability command for use -* with the capability type TPM_CAP_PROP or TPM_CAP_FLAG -* and their associated sub_capabilities. -*/ - -static const u8 tpm_cap[] = { -0 ,193 ,/* TPM_TAG_RQU_COMMAND */ -0 ,0 ,0 ,22 ,/* length */ -0 ,0 ,0 ,101 ,/* TPM_ORD_GetCapability */ -0 ,0 ,0 ,0 ,/* TPM_CAP_<TYPE> */ -0 ,0 ,0 ,4 ,/* TPM_CAP_SUB_<TYPE> size */ -0 ,0 ,1 ,0 /* TPM_CAP_SUB_<TYPE> */ }; -static ssize_t transmit_cmd (struct tpm_chip *chip,u8 *data,int len, -char *desc) +static ssize_t transmit_cmd (struct tpm_chip *chip,struct tpm_cmd_t *cmd, +int len,const char *desc) {int err; - len =tpm_transmit (chip, data, len); + len =tpm_transmit (chip,(u8 *) cmd, len);if (len <0 )return len;if (len ==TPM_ERROR_SIZE ) { - err =be32_to_cpu (*((__be32 *) (data +TPM_RET_CODE_IDX ))); + err =be32_to_cpu (cmd->header.out.return_code);dev_dbg (chip->dev,"A TPM error (%d) occurred %s\n" , err, desc);return err; }return 0 ; } +#define TPM_INTERNAL_RESULT_SIZE 200 +#define TPM_TAG_RQU_COMMAND cpu_to_be16(193) +#define TPM_ORD_GET_CAP cpu_to_be32(101) + +static const struct tpm_input_header tpm_getcap_header = { + .tag =TPM_TAG_RQU_COMMAND , + .length =cpu_to_be32 (22 ), + .ordinal =TPM_ORD_GET_CAP +}; + +ssize_t tpm_getcap (struct device *dev,__be32 subcap_id,cap_t *cap, +const char *desc) +{ +struct tpm_cmd_t tpm_cmd; +int rc; +struct tpm_chip *chip =dev_get_drvdata (dev); + + tpm_cmd.header.in = tpm_getcap_header; +if (subcap_id ==CAP_VERSION_1_1 || subcap_id ==CAP_VERSION_1_2 ) { + tpm_cmd.params.getcap_in.cap = subcap_id; +/*subcap field not necessary */ + tpm_cmd.params.getcap_in.subcap_size =cpu_to_be32 (0 ); + tpm_cmd.header.in.length -=cpu_to_be32 (sizeof (__be32)); + }else { +if (subcap_id ==TPM_CAP_FLAG_PERM || + subcap_id ==TPM_CAP_FLAG_VOL ) + tpm_cmd.params.getcap_in.cap =TPM_CAP_FLAG ; +else + tpm_cmd.params.getcap_in.cap =TPM_CAP_PROP ; + tpm_cmd.params.getcap_in.subcap_size =cpu_to_be32 (4 ); + tpm_cmd.params.getcap_in.subcap = subcap_id; + } + rc =transmit_cmd (chip, &tpm_cmd,TPM_INTERNAL_RESULT_SIZE , desc); +if (!rc) + *cap = tpm_cmd.params.getcap_out.cap; +return rc; +} +void tpm_gen_interrupt (struct tpm_chip *chip) { -u8 data[max_t (int,ARRAY_SIZE (tpm_cap),30 )]; +struct tpm_cmd_t tpm_cmd;ssize_t rc; -memcpy (data, tpm_cap,sizeof (tpm_cap)); - data[TPM_CAP_IDX ] =TPM_CAP_PROP ; - data[TPM_CAP_SUBCAP_IDX ] =TPM_CAP_PROP_TIS_TIMEOUT ; + tpm_cmd.header.in = tpm_getcap_header; + tpm_cmd.params.getcap_in.cap =TPM_CAP_PROP ; + tpm_cmd.params.getcap_in.subcap_size =cpu_to_be32 (4 ); + tpm_cmd.params.getcap_in.subcap =TPM_CAP_PROP_TIS_TIMEOUT ; - rc =transmit_cmd (chip, data,sizeof (data), + rc =transmit_cmd (chip, &tpm_cmd,TPM_INTERNAL_RESULT_SIZE ,"attempting to determine the timeouts" ); }EXPORT_SYMBOL_GPL (tpm_gen_interrupt);void tpm_get_timeouts (struct tpm_chip *chip) { -u8 data[max_t (int,ARRAY_SIZE (tpm_cap),30 )]; +struct tpm_cmd_t tpm_cmd; +struct timeout_t *timeout_cap; +struct duration_t *duration_cap;ssize_t rc;u32 timeout; -memcpy (data, tpm_cap,sizeof (tpm_cap)); - data[TPM_CAP_IDX ] =TPM_CAP_PROP ; - data[TPM_CAP_SUBCAP_IDX ] =TPM_CAP_PROP_TIS_TIMEOUT ; + tpm_cmd.header.in = tpm_getcap_header; + tpm_cmd.params.getcap_in.cap =TPM_CAP_PROP ; + tpm_cmd.params.getcap_in.subcap_size =cpu_to_be32 (4 ); + tpm_cmd.params.getcap_in.subcap =TPM_CAP_PROP_TIS_TIMEOUT ; - rc =transmit_cmd (chip, data,sizeof (data), + rc =transmit_cmd (chip, &tpm_cmd,TPM_INTERNAL_RESULT_SIZE ,"attempting to determine the timeouts" );if (rc) goto duration; -if (be32_to_cpu (*((__be32 *) (data +TPM_GET_CAP_RET_SIZE_IDX ))) +if (be32_to_cpu (tpm_cmd.header.out.length) !=4 *sizeof (u32)) goto duration; + timeout_cap = &tpm_cmd.params.getcap_out.cap.timeout;/* Don't overwrite default if value is 0 */ - timeout = -be32_to_cpu (*((__be32 *) (data +TPM_GET_CAP_RET_UINT32_1_IDX ))); + timeout =be32_to_cpu (timeout_cap->a);if (timeout) chip->vendor.timeout_a =usecs_to_jiffies (timeout); - timeout = -be32_to_cpu (*((__be32 *) (data +TPM_GET_CAP_RET_UINT32_2_IDX ))); + timeout =be32_to_cpu (timeout_cap->b);if (timeout) chip->vendor.timeout_b =usecs_to_jiffies (timeout); - timeout = -be32_to_cpu (*((__be32 *) (data +TPM_GET_CAP_RET_UINT32_3_IDX ))); + timeout =be32_to_cpu (timeout_cap->c);if (timeout) chip->vendor.timeout_c =usecs_to_jiffies (timeout); - timeout = -be32_to_cpu (*((__be32 *) (data +TPM_GET_CAP_RET_UINT32_4_IDX ))); + timeout =be32_to_cpu (timeout_cap->d);if (timeout) chip->vendor.timeout_d =usecs_to_jiffies (timeout); duration: -memcpy (data, tpm_cap,sizeof (tpm_cap)); - data[TPM_CAP_IDX ] =TPM_CAP_PROP ; - data[TPM_CAP_SUBCAP_IDX ] =TPM_CAP_PROP_TIS_DURATION ; + tpm_cmd.header.in = tpm_getcap_header; + tpm_cmd.params.getcap_in.cap =TPM_CAP_PROP ; + tpm_cmd.params.getcap_in.subcap_size =cpu_to_be32 (4 ); + tpm_cmd.params.getcap_in.subcap =TPM_CAP_PROP_TIS_DURATION ; - rc =transmit_cmd (chip, data,sizeof (data), + rc =transmit_cmd (chip, &tpm_cmd,TPM_INTERNAL_RESULT_SIZE ,"attempting to determine the durations" );if (rc)return ; -if (be32_to_cpu (*((__be32 *) (data +TPM_GET_CAP_RET_SIZE_IDX ))) +if (be32_to_cpu (tpm_cmd.header.out.return_code) !=3 *sizeof (u32))return ; - + duration_cap = &tpm_cmd.params.getcap_out.cap.duration; chip->vendor.duration[TPM_SHORT ] = -usecs_to_jiffies (be32_to_cpu - (*((__be32 *) (data + -TPM_GET_CAP_RET_UINT32_1_IDX )))); +usecs_to_jiffies (be32_to_cpu (duration_cap->tpm_short));/* The Broadcom BCM0102 chipset in a Dell Latitude D820 gets the above * value wrong and apparently reports msecs rather than usecs. So we * fix up the resulting too-small TPM_SHORT value to make things work.
@@ -565,13 +579,9 @@ duration: chip->vendor.duration[TPM_SHORT ] =HZ ; chip->vendor.duration[TPM_MEDIUM ] = -usecs_to_jiffies (be32_to_cpu - (*((__be32 *) (data + -TPM_GET_CAP_RET_UINT32_2_IDX )))); +usecs_to_jiffies (be32_to_cpu (duration_cap->tpm_medium)); chip->vendor.duration[TPM_LONG ] = -usecs_to_jiffies (be32_to_cpu - (*((__be32 *) (data + -TPM_GET_CAP_RET_UINT32_3_IDX )))); +usecs_to_jiffies (be32_to_cpu (duration_cap->tpm_long)); }EXPORT_SYMBOL_GPL (tpm_get_timeouts);
@@ -587,36 +597,18 @@ void tpm_continue_selftest(struct tpm_chip *chip) }EXPORT_SYMBOL_GPL (tpm_continue_selftest); -#define TPM_INTERNAL_RESULT_SIZE 200 -ssize_t tpm_show_enabled (struct device * dev,struct device_attribute * attr,char *buf) { -u8 *data; +cap_t cap;ssize_t rc; -struct tpm_chip *chip =dev_get_drvdata (dev); -if (chip ==NULL ) -return -ENODEV ; - - data =kzalloc (TPM_INTERNAL_RESULT_SIZE ,GFP_KERNEL ); -if (!data) -return -ENOMEM ; - -memcpy (data, tpm_cap,sizeof (tpm_cap)); - data[TPM_CAP_IDX ] =TPM_CAP_FLAG ; - data[TPM_CAP_SUBCAP_IDX ] =TPM_CAP_FLAG_PERM ; - - rc =transmit_cmd (chip, data,TPM_INTERNAL_RESULT_SIZE , -"attemtping to determine the permanent enabled state" ); -if (rc) { -kfree (data); + rc =tpm_getcap (dev,TPM_CAP_FLAG_PERM , &cap, +"attempting to determine the permanent enabled state" ); +if (rc)return 0 ; - } - - rc =sprintf (buf,"%d\n" , !data[TPM_GET_CAP_PERM_DISABLE_IDX ]); -kfree (data); + rc =sprintf (buf,"%d\n" , !cap.perm_flags.disable);return rc; }EXPORT_SYMBOL_GPL (tpm_show_enabled);
@@ -624,31 +616,15 @@ EXPORT_SYMBOL_GPL(tpm_show_enabled);ssize_t tpm_show_active (struct device * dev,struct device_attribute * attr,char *buf) { -u8 *data; +cap_t cap;ssize_t rc; -struct tpm_chip *chip =dev_get_drvdata (dev); -if (chip ==NULL ) -return -ENODEV ; - - data =kzalloc (TPM_INTERNAL_RESULT_SIZE ,GFP_KERNEL ); -if (!data) -return -ENOMEM ; - -memcpy (data, tpm_cap,sizeof (tpm_cap)); - data[TPM_CAP_IDX ] =TPM_CAP_FLAG ; - data[TPM_CAP_SUBCAP_IDX ] =TPM_CAP_FLAG_PERM ; - - rc =transmit_cmd (chip, data,TPM_INTERNAL_RESULT_SIZE , -"attemtping to determine the permanent active state" ); -if (rc) { -kfree (data); + rc =tpm_getcap (dev,TPM_CAP_FLAG_PERM , &cap, +"attempting to determine the permanent active state" ); +if (rc)return 0 ; - } - rc =sprintf (buf,"%d\n" , !data[TPM_GET_CAP_PERM_INACTIVE_IDX ]); - -kfree (data); + rc =sprintf (buf,"%d\n" , !cap.perm_flags.deactivated);return rc; }EXPORT_SYMBOL_GPL (tpm_show_active);
@@ -656,31 +632,15 @@ EXPORT_SYMBOL_GPL(tpm_show_active);ssize_t tpm_show_owned (struct device * dev,struct device_attribute * attr,char *buf) { -u8 *data; +cap_t cap;ssize_t rc; -struct tpm_chip *chip =dev_get_drvdata (dev); -if (chip ==NULL ) -return -ENODEV ; - - data =kzalloc (TPM_INTERNAL_RESULT_SIZE ,GFP_KERNEL ); -if (!data) -return -ENOMEM ; - -memcpy (data, tpm_cap,sizeof (tpm_cap)); - data[TPM_CAP_IDX ] =TPM_CAP_PROP ; - data[TPM_CAP_SUBCAP_IDX ] =TPM_CAP_PROP_OWNER ; - - rc =transmit_cmd (chip, data,TPM_INTERNAL_RESULT_SIZE , -"attempting to determine the owner state" ); -if (rc) { -kfree (data); + rc =tpm_getcap (dev,TPM_CAP_PROP_OWNER , &cap, +"attempting to determine the owner state" ); +if (rc)return 0 ; - } - - rc =sprintf (buf,"%d\n" , data[TPM_GET_CAP_RET_BOOL_1_IDX ]); -kfree (data); + rc =sprintf (buf,"%d\n" , cap.owned);return rc; }EXPORT_SYMBOL_GPL (tpm_show_owned);
@@ -688,31 +648,15 @@ EXPORT_SYMBOL_GPL(tpm_show_owned);ssize_t tpm_show_temp_deactivated (struct device * dev,struct device_attribute * attr,char *buf) { -u8 *data; +cap_t cap;ssize_t rc; -struct tpm_chip *chip =dev_get_drvdata (dev); -if (chip ==NULL ) -return -ENODEV ; - - data =kzalloc (TPM_INTERNAL_RESULT_SIZE ,GFP_KERNEL ); -if (!data) -return -ENOMEM ; - -memcpy (data, tpm_cap,sizeof (tpm_cap)); - data[TPM_CAP_IDX ] =TPM_CAP_FLAG ; - data[TPM_CAP_SUBCAP_IDX ] =TPM_CAP_FLAG_VOL ; - - rc =transmit_cmd (chip, data,TPM_INTERNAL_RESULT_SIZE , -"attempting to determine the temporary state" ); -if (rc) { -kfree (data); + rc =tpm_getcap (dev,TPM_CAP_FLAG_VOL , &cap, +"attempting to determine the temporary state" ); +if (rc)return 0 ; - } - rc =sprintf (buf,"%d\n" , data[TPM_GET_CAP_TEMP_INACTIVE_IDX ]); - -kfree (data); + rc =sprintf (buf,"%d\n" , cap.stclear_flags.deactivated);return rc; }EXPORT_SYMBOL_GPL (tpm_show_temp_deactivated);
@@ -727,77 +671,64 @@ static const u8 pcrread[] = {ssize_t tpm_show_pcrs (struct device *dev,struct device_attribute *attr,char *buf) { +cap_t cap;u8 *data;ssize_t rc;int i, j, num_pcrs;__be32 index;char *str = buf; -struct tpm_chip *chip =dev_get_drvdata (dev); -if (chip ==NULL ) -return -ENODEV ; data =kzalloc (TPM_INTERNAL_RESULT_SIZE ,GFP_KERNEL );if (!data)return -ENOMEM ; -memcpy (data, tpm_cap,sizeof (tpm_cap)); - data[TPM_CAP_IDX ] =TPM_CAP_PROP ; - data[TPM_CAP_SUBCAP_IDX ] =TPM_CAP_PROP_PCR ; - - rc =transmit_cmd (chip, data,TPM_INTERNAL_RESULT_SIZE , + rc =tpm_getcap (dev,TPM_CAP_PROP_PCR , &cap,"attempting to determine the number of PCRS" ); -if (rc) { -kfree (data); +if (rc)return 0 ; - } - num_pcrs =be32_to_cpu (*((__be32 *) (data +14 ))); + num_pcrs =be32_to_cpu (cap.num_pcrs);for (i =0 ; i < num_pcrs; i++) {memcpy (data, pcrread,sizeof (pcrread)); index =cpu_to_be32 (i);memcpy (data +10 , &index,4 ); - rc =transmit_cmd (chip, data,TPM_INTERNAL_RESULT_SIZE , -"attempting to read a PCR" ); + rc =transmit_cmd (chip, (struct tpm_cmd_t *)data, +TPM_INTERNAL_RESULT_SIZE , +"attempting to read a PCR" );if (rc) - goto out; +break ; str +=sprintf (str,"PCR-%02d: " , i);for (j =0 ; j <TPM_DIGEST_SIZE ; j++) str +=sprintf (str,"%02X " , *(data +10 + j)); str +=sprintf (str,"\n" ); } -out:kfree (data);return str - buf; }EXPORT_SYMBOL_GPL (tpm_show_pcrs);#define READ_PUBEK_RESULT_SIZE 314 -static const u8 readpubek[] = { -0 ,193 ,/* TPM_TAG_RQU_COMMAND */ -0 ,0 ,0 ,30 ,/* length */ -0 ,0 ,0 ,124 ,/* TPM_ORD_ReadPubek */ +#define TPM_ORD_READPUBEK cpu_to_be32(124) +struct tpm_input_header tpm_readpubek_header = { + .tag =TPM_TAG_RQU_COMMAND , + .length =cpu_to_be32 (30 ), + .ordinal =TPM_ORD_READPUBEK };ssize_t tpm_show_pubek (struct device *dev,struct device_attribute *attr,char *buf) {u8 *data; +struct tpm_cmd_t tpm_cmd;ssize_t err;int i, rc;char *str = buf;struct tpm_chip *chip =dev_get_drvdata (dev); -if (chip ==NULL ) -return -ENODEV ; - data =kzalloc (READ_PUBEK_RESULT_SIZE ,GFP_KERNEL ); -if (!data) -return -ENOMEM ; - -memcpy (data, readpubek,sizeof (readpubek)); - - err =transmit_cmd (chip, data,READ_PUBEK_RESULT_SIZE , + tpm_cmd.header.in = tpm_readpubek_header; + err =transmit_cmd (chip, &tpm_cmd,READ_PUBEK_RESULT_SIZE ,"attempting to read the PUBEK" );if (err) goto out;
@@ -812,7 +743,7 @@ ssize_t tpm_show_pubek(struct device *dev, struct device_attribute *attr,256 byte modulus ignore checksum 20 bytes */ - + data = tpm_cmd.params.readpubek_out_buffer; str +=sprintf (str, "Algorithm: %02X %02X %02X %02X\nEncscheme: %02X %02X\n"
@@ -832,65 +763,33 @@ ssize_t tpm_show_pubek(struct device *dev, struct device_attribute *attr, } out: rc = str - buf; -kfree (data);return rc; }EXPORT_SYMBOL_GPL (tpm_show_pubek); -#define CAP_VERSION_1_1 6 -#define CAP_VERSION_1_2 0x1A -#define CAP_VERSION_IDX 13 -static const u8 cap_version[] = { -0 ,193 ,/* TPM_TAG_RQU_COMMAND */ -0 ,0 ,0 ,18 ,/* length */ -0 ,0 ,0 ,101 ,/* TPM_ORD_GetCapability */ -0 ,0 ,0 ,0 , -0 ,0 ,0 ,0 -};ssize_t tpm_show_caps (struct device *dev,struct device_attribute *attr,char *buf) { -u8 *data; +cap_t cap;ssize_t rc;char *str = buf; -struct tpm_chip *chip =dev_get_drvdata (dev); -if (chip ==NULL ) -return -ENODEV ; - - data =kzalloc (TPM_INTERNAL_RESULT_SIZE ,GFP_KERNEL ); -if (!data) -return -ENOMEM ; - -memcpy (data, tpm_cap,sizeof (tpm_cap)); - data[TPM_CAP_IDX ] =TPM_CAP_PROP ; - data[TPM_CAP_SUBCAP_IDX ] =TPM_CAP_PROP_MANUFACTURER ; - - rc =transmit_cmd (chip, data,TPM_INTERNAL_RESULT_SIZE , + rc =tpm_getcap (dev,TPM_CAP_PROP_MANUFACTURER , &cap,"attempting to determine the manufacturer" ); -if (rc) { -kfree (data); +if (rc)return 0 ; - } - str +=sprintf (str,"Manufacturer: 0x%x\n" , -be32_to_cpu (*((__be32 *) (data +TPM_GET_CAP_RET_UINT32_1_IDX )))); +be32_to_cpu (cap.manufacturer_id)); -memcpy (data, cap_version,sizeof (cap_version)); - data[CAP_VERSION_IDX ] =CAP_VERSION_1_1 ; - rc =transmit_cmd (chip, data,TPM_INTERNAL_RESULT_SIZE , -"attempting to determine the 1.1 version" ); + rc =tpm_getcap (dev,CAP_VERSION_1_1 , &cap, +"attempting to determine the 1.1 version" );if (rc) - goto out; - +return 0 ; str +=sprintf (str,"TCG version: %d.%d\nFirmware version: %d.%d\n" , - (int ) data[14 ], (int ) data[15 ], (int ) data[16 ], - (int ) data[17 ]); - -out: -kfree (data); + cap.tpm_version.Major, cap.tpm_version.Minor, + cap.tpm_version.revMajor, cap.tpm_version.revMinor);return str - buf; }EXPORT_SYMBOL_GPL (tpm_show_caps);
@@ -898,51 +797,25 @@ EXPORT_SYMBOL_GPL(tpm_show_caps);ssize_t tpm_show_caps_1_2 (struct device * dev,struct device_attribute * attr,char *buf) { -u8 *data; -ssize_t len; +cap_t cap; +ssize_t rc;char *str = buf; -struct tpm_chip *chip =dev_get_drvdata (dev); -if (chip ==NULL ) -return -ENODEV ; - - data =kzalloc (TPM_INTERNAL_RESULT_SIZE ,GFP_KERNEL ); -if (!data) -return -ENOMEM ; - -memcpy (data, tpm_cap,sizeof (tpm_cap)); - data[TPM_CAP_IDX ] =TPM_CAP_PROP ; - data[TPM_CAP_SUBCAP_IDX ] =TPM_CAP_PROP_MANUFACTURER ; - - len =tpm_transmit (chip, data,TPM_INTERNAL_RESULT_SIZE ); -if (len <=TPM_ERROR_SIZE ) { -dev_dbg (chip->dev,"A TPM error (%d) occurred " -"attempting to determine the manufacturer\n" , -be32_to_cpu (*((__be32 *) (data +TPM_RET_CODE_IDX )))); -kfree (data); + rc =tpm_getcap (dev,TPM_CAP_PROP_MANUFACTURER , &cap, +"attempting to determine the manufacturer" ); +if (rc)return 0 ; - } - str +=sprintf (str,"Manufacturer: 0x%x\n" , -be32_to_cpu (*((__be32 *) (data +TPM_GET_CAP_RET_UINT32_1_IDX )))); - -memcpy (data, cap_version,sizeof (cap_version)); - data[CAP_VERSION_IDX ] =CAP_VERSION_1_2 ; - - len =tpm_transmit (chip, data,TPM_INTERNAL_RESULT_SIZE ); -if (len <=TPM_ERROR_SIZE ) { -dev_err (chip->dev,"A TPM error (%d) occurred " -"attempting to determine the 1.2 version\n" , -be32_to_cpu (*((__be32 *) (data +TPM_RET_CODE_IDX )))); - goto out; - } +be32_to_cpu (cap.manufacturer_id)); + rc =tpm_getcap (dev,CAP_VERSION_1_2 , &cap, +"attempting to determine the 1.2 version" ); +if (rc) +return 0 ; str +=sprintf (str,"TCG version: %d.%d\nFirmware version: %d.%d\n" , - (int ) data[16 ], (int ) data[17 ], (int ) data[18 ], - (int ) data[19 ]); - -out: -kfree (data); + cap.tpm_version_1_2.Major, cap.tpm_version_1_2.Minor, + cap.tpm_version_1_2.revMajor, + cap.tpm_version_1_2.revMinor);return str - buf; }EXPORT_SYMBOL_GPL (tpm_show_caps_1_2);
drivers/char/tpm/tpm.h +124 -0
130 lines not on this page · raw message
Signature · 1 line
1.5.6.3
PATCH 2/2 TPM: integrity interface
In reply to Rajiv AndradeThis patch adds internal kernel support for:
- reading/extending a pcr value
- looking up the tpm_chip for a given chip number
--- drivers/char/tpm/tpm.c | 129 +++++++++++++++++++++++++++++++++++++++++------- drivers/char/tpm/tpm.h | 18 +++++++ include/linux/tpm.h | 35 +++++++++++++ 3 files changed, 163 insertions(+), 19 deletions(-) create mode 100644 include/linux/tpm.h
drivers/char/tpm/tpm.c +110 -19
@@ -661,28 +661,125 @@ ssize_t tpm_show_temp_deactivated(struct device * dev, }EXPORT_SYMBOL_GPL (tpm_show_temp_deactivated); -static const u8 pcrread[] = { -0 ,193 ,/* TPM_TAG_RQU_COMMAND */ -0 ,0 ,0 ,14 ,/* length */ -0 ,0 ,0 ,21 ,/* TPM_ORD_PcrRead */ -0 ,0 ,0 ,0 /* PCR index */ +/* +* tpm_chip_find_get - return tpm_chip for given chip number +*/ +static struct tpm_chip *tpm_chip_find_get (int chip_num) +{ +struct tpm_chip *pos; + +rcu_read_lock (); +list_for_each_entry_rcu (pos, &tpm_chip_list, list) { +if (chip_num !=TPM_ANY_NUM && chip_num != pos->dev_num) +continue ; + +if (try_module_get (pos->dev->driver->owner)) +break ; + } +rcu_read_unlock (); +return pos; +} + +#define TPM_ORDINAL_PCRREAD cpu_to_be32(21) +#define READ_PCR_RESULT_SIZE 30 +static struct tpm_input_header pcrread_header = { + .tag =TPM_TAG_RQU_COMMAND , + .length =cpu_to_be32 (14 ), + .ordinal =TPM_ORDINAL_PCRREAD +}; + +int __tpm_pcr_read (struct tpm_chip *chip,int pcr_idx,u8 *res_buf) +{ +int rc; +struct tpm_cmd_t cmd; + + cmd.header.in = pcrread_header; + cmd.params.pcrread_in.pcr_idx =cpu_to_be32 (pcr_idx); +BUILD_BUG_ON (cmd.header.in.length >READ_PCR_RESULT_SIZE ); + rc =transmit_cmd (chip, &cmd, cmd.header.in.length, +"attempting to read a pcr value" ); + +if (rc ==0 ) +memcpy (res_buf, cmd.params.pcrread_out.pcr_result, +TPM_DIGEST_SIZE ); +return rc; +} + +/** +* tpm_pcr_read - read a pcr value +* @chip_num: tpm idx # or ANY +* @pcr_idx: pcr idx to retrieve +* @res_buf: TPM_PCR value +* size of res_buf is 20 bytes (or NULL if you don't care) +* +* The TPM driver should be built-in, but for whatever reason it +* isn't, protect against the chip disappearing, by incrementing +* the module usage count. +*/ +int tpm_pcr_read (u32 chip_num,int pcr_idx,u8 *res_buf) +{ +struct tpm_chip *chip; +int rc; + + chip =tpm_chip_find_get (chip_num); +if (chip ==NULL ) +return -ENODEV ; + rc =__tpm_pcr_read (chip, pcr_idx, res_buf); +module_put (chip->dev->driver->owner); +return rc; +} +EXPORT_SYMBOL_GPL (tpm_pcr_read); + +/** +* tpm_pcr_extend - extend pcr value with hash +* @chip_num: tpm idx # or AN& +* @pcr_idx: pcr idx to extend +* @hash: hash value used to extend pcr value +* +* The TPM driver should be built-in, but for whatever reason it +* isn't, protect against the chip disappearing, by incrementing +* the module usage count. +*/ +#define TPM_ORD_PCR_EXTEND cpu_to_be32(20) +#define EXTEND_PCR_SIZE 34 +static struct tpm_input_header pcrextend_header = { + .tag =TPM_TAG_RQU_COMMAND , + .length =cpu_to_be32 (34 ), + .ordinal =TPM_ORD_PCR_EXTEND }; +int tpm_pcr_extend (u32 chip_num,int pcr_idx,const u8 *hash) +{ +struct tpm_cmd_t cmd; +int rc; +struct tpm_chip *chip; + + chip =tpm_chip_find_get (chip_num); +if (chip ==NULL ) +return -ENODEV ; + + cmd.header.in = pcrextend_header; +BUILD_BUG_ON (be32_to_cpu (cmd.header.in.length) >EXTEND_PCR_SIZE ); + cmd.params.pcrextend_in.pcr_idx =cpu_to_be32 (pcr_idx); +memcpy (cmd.params.pcrextend_in.hash, hash,TPM_DIGEST_SIZE ); + rc =transmit_cmd (chip, &cmd, cmd.header.in.length, +"attempting extend a PCR value" ); + +module_put (chip->dev->driver->owner); +return rc; +} +EXPORT_SYMBOL_GPL (tpm_pcr_extend); +ssize_t tpm_show_pcrs (struct device *dev,struct device_attribute *attr,char *buf) {cap_t cap; -u8 *data; +u8 digest[TPM_DIGEST_SIZE ];ssize_t rc;int i, j, num_pcrs; -__be32 index;char *str = buf;struct tpm_chip *chip =dev_get_drvdata (dev); - data =kzalloc (TPM_INTERNAL_RESULT_SIZE ,GFP_KERNEL ); -if (!data) -return -ENOMEM ; - rc =tpm_getcap (dev,TPM_CAP_PROP_PCR , &cap,"attempting to determine the number of PCRS" );if (rc)
@@ -690,20 +787,14 @@ ssize_t tpm_show_pcrs(struct device *dev, struct device_attribute *attr, num_pcrs =be32_to_cpu (cap.num_pcrs);for (i =0 ; i < num_pcrs; i++) { -memcpy (data, pcrread,sizeof (pcrread)); - index =cpu_to_be32 (i); -memcpy (data +10 , &index,4 ); - rc =transmit_cmd (chip, (struct tpm_cmd_t *)data, -TPM_INTERNAL_RESULT_SIZE , -"attempting to read a PCR" ); + rc =__tpm_pcr_read (chip, i, digest);if (rc)break ; str +=sprintf (str,"PCR-%02d: " , i);for (j =0 ; j <TPM_DIGEST_SIZE ; j++) - str +=sprintf (str,"%02X " , *(data +10 + j)); + str +=sprintf (str,"%02X " , digest[j]); str +=sprintf (str,"\n" ); } -kfree (data);return str - buf; }EXPORT_SYMBOL_GPL (tpm_show_pcrs);
drivers/char/tpm/tpm.h +18 -0
@@ -26,6 +26,7 @@#include <linux/miscdevice.h> #include <linux/platform_device.h> #include <linux/io.h> +#include <linux/tpm.h> enum tpm_timeout {TPM_TIMEOUT =5 ,/* msecs */
@@ -234,11 +235,28 @@ typedef union {struct tpm_output_header out; } tpm_cmd_header; +#define TPM_DIGEST_SIZE 20 +struct tpm_pcrread_out { +u8 pcr_result[TPM_DIGEST_SIZE ]; +}__attribute__((packed)); + +struct tpm_pcrread_in { +__be32 pcr_idx; +}__attribute__((packed)); + +struct tpm_pcrextend_in { +__be32 pcr_idx; +u8 hash[TPM_DIGEST_SIZE ]; +}__attribute__((packed)); +typedef union {struct tpm_getcap_params_out getcap_out;struct tpm_readpubek_params_out readpubek_out;u8 readpubek_out_buffer[sizeof (struct tpm_readpubek_params_out )];struct tpm_getcap_params_in getcap_in; +struct tpm_pcrread_in pcrread_in; +struct tpm_pcrread_out pcrread_out; +struct tpm_pcrextend_in pcrextend_in; }tpm_cmd_params ;struct tpm_cmd_t {
include/linux/tpm.h new file +35 -0
@@ -0,0 +1,35 @@ +/* +* Copyright (C) 2004,2007,2008 IBM Corporation +* +* Authors: +* Leendert van Doorn <[email protected]> +* Dave Safford <[email protected]> +* Reiner Sailer <[email protected]> +* Kylene Hall <[email protected]> +* Debora Velarde <[email protected]> +* +* Maintained by: <[email protected]> +* +* Device driver for TCG/TCPA TPM (trusted platform module). +* Specifications at www.trustedcomputinggroup.org +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation, version 2 of the +* License. +* +*/ +#ifndef __LINUX_TPM_H__ +#define __LINUX_TPM_H__ + +/* +* Chip num is this value or a valid tpm idx +*/ +#define TPM_ANY_NUM 0xFFFF + +#if defined(CONFIG_TCG_TPM ) + +extern int tpm_pcr_read (u32 chip_num,int pcr_idx,u8 *res_buf); +extern int tpm_pcr_extend (u32 chip_num,int pcr_idx,const u8 *hash); +#endif +#endif
Signature · 1 line
1.5.6.3
Re: [PATCH 2/2] TPM: integrity interface
Quoted 6 lines · Rajiv Andrade
This patch adds internal kernel support for:
- reading/extending a pcr value
- looking up thetpm_chipfor a given chip numberSigned-off-by Rajiv Andrade <[email protected]>Signed-off-by Mimi Zohar <[email protected]>
This looks pretty nice, and though it's been awhile since I've looked at this, the locking looks good too.
Quoted 7 lines · Rajiv Andrade
This patchset contains a refactoring patch and integrity one. The first addresses Matt Helsley and Dave Hansen's comments on replacing the data[] vectors by packed structures making the code easier to read and debug and also consolidates most of the tpm_show_* functions. The second one provides an interface to read and extend PCR values, which is widely used by IMA.
This version also addresses Matt Helsley's last observation on the
timeout_tstructure usage to accessTPM_CAP_PROP_TIS_DURATIONcapability, now a new structure is being used,duration_t, whose fields now match exactly as defined in the TPM specification.Rajiv Andrade (2):
TPM: sysfs functions consolidation
TPM: integrity interface
Which kernel are these patches against? They don't apply to either security-testing or linus.
Signature · 2 lines
James Morris <[email protected]>
Quoted 8 lines · Rajiv Andrade
This patchset contains a refactoring patch and integrity one. The first addresses Matt Helsley and Dave Hansen's comments on replacing the data[] vectors by packed structures making the code easier to read and debug and also consolidates most of the tpm_show_* functions. The second one provides an interface to read and extend PCR values, which is widely used by IMA.
This version also addresses Matt Helsley's last observation on the
timeout_tstructure usage to accessTPM_CAP_PROP_TIS_DURATIONcapability, now a new structure is being used,duration_t, whose fields now match exactly as defined in the TPM specification.Rajiv Andrade (2):
TPM: sysfs functions consolidation
TPM: integrity interface
Quoted 5 lines
drivers/char/tpm/tpm.c | 528 ++++++++++++++++++++++-------------------------- drivers/char/tpm/tpm.h | 142 +++++++++++++ include/linux/tpm.h | 35 ++++ 3 files changed, 423 insertions(+), 282 deletions(-) create mode 100644 include/linux/tpm.h
Applied togit://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6#next
(For some reason, these ended up out of order in my mail folder which upset git-am... fixed manually).
Signature · 2 lines
James Morris <[email protected]>