tpm: reorganize sysfs files - Updated patch
PATCH 2/7 tpm: reorganize sysfs files - Updated patch
Many of the sysfs files were calling the TPM_GetCapability command with different options and each command layed out in its own static const array. Since for 1.2 more sysfs files of this type are coming I am generalizing the array so there can be one array and the unique parts can be filled in just before the command is called.
This updated version of the patch addresses the code redundancy and ugliness in the tpm_show_* functions pointed out by Dave. It replaces the 2/7 patch from the original set.
--- drivers/char/tpm/tpm.c | 147 +++++++++++++++++++++++---------------- 1 files changed, 87 insertions(+), 60 deletions(-)
drivers/char/tpm/tpm.c +87 -60
@@ -119,17 +119,57 @@ out: }#define TPM_DIGEST_SIZE 20 -#define CAP_PCR_RESULT_SIZE 18 -static const u8 cap_pcr[] = { +#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_CAP_IDX 13 +#define TPM_CAP_SUBCAP_IDX 21 + +enum tpm_capabilities { +TPM_CAP_PROP =5 , +}; + +enum tpm_sub_capabilities { +TPM_CAP_PROP_PCR =0x1 , +TPM_CAP_PROP_MANUFACTURER =0x3 , +}; + +/* +* 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 ,5 , -0 ,0 ,0 ,4 , -0 ,0 ,1 ,1 +0 ,0 ,0 ,0 ,/* TPM_CAP_<TYPE> */ +0 ,0 ,0 ,4 ,/* TPM_CAP_SUB_<TYPE> size */ +0 ,0 ,1 ,0 /* TPM_CAP_SUB_<TYPE> */ }; -#define READ_PCR_RESULT_SIZE 30 +static ssize_t transmit_cmd (struct tpm_chip *chip,u8 *data,int len, +char *desc) +{ +int err; + + len =tpm_transmit (chip, data, len); +if (len <0 ) +return len; +if (len ==TPM_ERROR_SIZE ) { + err =be32_to_cpu (*((__be32 *) (data +TPM_RET_CODE_IDX ))); +dev_dbg (chip->dev,"A TPM error (%d) occurred %s\n" , err, desc); +return err; + } +return 0 ; +} +static const u8 pcrread[] = {0 ,193 ,/* TPM_TAG_RQU_COMMAND */ 0 ,0 ,0 ,14 ,/* length */
@@ -140,8 +180,8 @@ static const u8 pcrread[] = {ssize_t tpm_show_pcrs (struct device *dev,struct device_attribute *attr,char *buf) { -u8 data[READ_PCR_RESULT_SIZE ]; -ssize_t len; +u8 data[30 ]; +ssize_t rc;int i, j, num_pcrs;__be32 index;char *str = buf;
@@ -150,29 +190,24 @@ ssize_t tpm_show_pcrs(struct device *devif (chip ==NULL )return -ENODEV ; -memcpy (data, cap_pcr,sizeof (cap_pcr)); -if ((len =tpm_transmit (chip, data,sizeof (data))) - <CAP_PCR_RESULT_SIZE ) { -dev_dbg (chip->dev,"A TPM error (%d) occurred " -"attempting to determine the number of PCRS\n" , -be32_to_cpu (*((__be32 *) (data +6 )))); +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,sizeof (data), +"attempting to determine the number of PCRS" ); +if (rc)return 0 ; - } num_pcrs =be32_to_cpu (*((__be32 *) (data +14 ))); -for (i =0 ; i < num_pcrs; i++) {memcpy (data, pcrread,sizeof (pcrread)); index =cpu_to_be32 (i);memcpy (data +10 , &index,4 ); -if ((len =tpm_transmit (chip, data,sizeof (data))) - <READ_PCR_RESULT_SIZE ){ -dev_dbg (chip->dev,"A TPM error (%d) occurred" -" attempting to read PCR %d of %d\n" , -be32_to_cpu (*((__be32 *) (data +6 ))), - i, num_pcrs); + rc =transmit_cmd (chip, data,sizeof (data), +"attempting to read a PCR" ); +if (rc) goto out; - } str +=sprintf (str,"PCR-%02d: " , i);for (j =0 ; j <TPM_DIGEST_SIZE ; j++) str +=sprintf (str,"%02X " , *(data +10 + j));
@@ -194,7 +229,7 @@ ssize_t tpm_show_pubek(struct device *de char *buf) {u8 *data; -ssize_t len; +ssize_t err;int i, rc;char *str = buf;
@@ -208,14 +243,10 @@ ssize_t tpm_show_pubek(struct device *dememcpy (data, readpubek,sizeof (readpubek)); -if ((len =tpm_transmit (chip, data,READ_PUBEK_RESULT_SIZE )) < -READ_PUBEK_RESULT_SIZE ) { -dev_dbg (chip->dev,"A TPM error (%d) occurred " -"attempting to read the PUBEK\n" , -be32_to_cpu (*((__be32 *) (data +6 )))); - rc =0 ; + err =transmit_cmd (chip, data,READ_PUBEK_RESULT_SIZE , +"attempting to read the PUBEK" ); +if (err) goto out; - }/* ignore header 10 bytes
@@ -245,63 +276,59 @@ ssize_t tpm_show_pubek(struct device *deif ((i +1 ) %16 ==0 ) str +=sprintf (str,"\n" ); } - rc = str - buf; out: + rc = str - buf;kfree (data);return rc; }EXPORT_SYMBOL_GPL (tpm_show_pubek); -#define CAP_VER_RESULT_SIZE 18 +#define CAP_VERSION_1_1 6 +#define CAP_VERSION_IDX 13static 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 ,6 , +0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 }; -#define CAP_MANUFACTURER_RESULT_SIZE 18 -static const u8 cap_manufacturer[] = { -0 ,193 ,/* TPM_TAG_RQU_COMMAND */ -0 ,0 ,0 ,22 ,/* length */ -0 ,0 ,0 ,101 ,/* TPM_ORD_GetCapability */ -0 ,0 ,0 ,5 , -0 ,0 ,0 ,4 , -0 ,0 ,1 ,3 -}; -ssize_t tpm_show_caps (struct device *dev,struct device_attribute *attr,char *buf) { -u8 data[sizeof (cap_manufacturer)]; -ssize_t len; +u8 data[30 ]; +ssize_t rc;char *str = buf;struct tpm_chip *chip =dev_get_drvdata (dev);if (chip ==NULL )return -ENODEV ; -memcpy (data, cap_manufacturer,sizeof (cap_manufacturer)); - -if ((len =tpm_transmit (chip, data,sizeof (data))) < -CAP_MANUFACTURER_RESULT_SIZE ) -return len; +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,sizeof (data), +"attempting to determine the manufacturer" ); +if (rc) +return 0 ; str +=sprintf (str,"Manufacturer: 0x%x\n" , -be32_to_cpu (*((__be32 *) (data +14 )))); +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_1 ; + rc =transmit_cmd (chip, data,sizeof (data), +"attempting to determine the 1.1 version" ); +if (rc) + goto out; -if ((len =tpm_transmit (chip, data,sizeof (data))) < -CAP_VER_RESULT_SIZE ) -return len; - - str += -sprintf (str,"TCG version: %d.%d\nFirmware version: %d.%d\n" , - (int ) data[14 ], (int ) data[15 ], (int ) data[16 ], - (int ) data[17 ]); + 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:return str - buf; }EXPORT_SYMBOL_GPL (tpm_show_caps);
Quoted 15 lines · Kylene Jo Hall
ssize_ttpm_show_pcrs(struct device *dev, structdevice_attribute*attr,
char *buf)
{
- u8 data[READ_PCR_RESULT_SIZE];
-ssize_tlen;
+ u8 data[30];
+ssize_trc;
int i, j,num_pcrs;
__be32index;
char *str = buf;
@@ -150,29 +190,24 @@ssize_ttpm_show_pcrs(struct device *dev
if (chip == NULL)
return-ENODEV;
Quoted 7 lines
-
memcpy(data, cap_pcr, sizeof(cap_pcr));
- if ((len =tpm_transmit(chip, data, sizeof(data)))
- <CAP_PCR_RESULT_SIZE) {
- dev_dbg(chip->dev, "A TPM error (%d) occurred "
- "attempting to determine the number of PCRS\n",
-be32_to_cpu(*((__be32 *) (data + 6))));
+memcpy(data, tpm_cap, sizeof(tpm_cap));
I'd be a bit worried about potential for array overruns here. If someone later were to increase the size of tpm_cap[] we'll silently overrun data[].
One approach would be to do:
drivers/char/tpm/tpm.c renamed from drivers/char/tpm/tpm.c~tpm-reorganize-sysfs-files-fix +2 -2
@@ -180,7 +180,7 @@ static const u8 pcrread[] = {ssize_t tpm_show_pcrs (struct device *dev,struct device_attribute *attr,char *buf) { -u8 data[30 ]; +u8 data[ARRAY_SIZE (tpm_cap)];ssize_t rc;int i, j, num_pcrs;__be32 index;
@@ -296,7 +296,7 @@ static const u8 cap_version[] = {ssize_t tpm_show_caps (struct device *dev,struct device_attribute *attr,char *buf) { -u8 data[30 ]; +u8 data[max (ARRAY_SIZE (tpm_cap),ARRAY_SIZE (cap_version))];ssize_t rc;char *str = buf;
_
Does that look OK?
Quoted 52 lines · Andrew Morton
Quoted 15 lines · Kylene Jo Hall
ssize_ttpm_show_pcrs(struct device *dev, structdevice_attribute*attr,
char *buf)
{
- u8 data[READ_PCR_RESULT_SIZE];
-ssize_tlen;
+ u8 data[30];
+ssize_trc;
int i, j,num_pcrs;
__be32index;
char *str = buf;
@@ -150,29 +190,24 @@ssize_ttpm_show_pcrs(struct device *dev
if (chip == NULL)
return-ENODEV;Quoted 7 lines
-
memcpy(data, cap_pcr, sizeof(cap_pcr));
- if ((len =tpm_transmit(chip, data, sizeof(data)))
- <CAP_PCR_RESULT_SIZE) {
- dev_dbg(chip->dev, "A TPM error (%d) occurred "
- "attempting to determine the number of PCRS\n",
-be32_to_cpu(*((__be32 *) (data + 6))));
+memcpy(data, tpm_cap, sizeof(tpm_cap));I'd be a bit worried about potential for array overruns here. If someone later were to increase the size of tpm_cap[] we'll silently overrun data[].
One approach would be to do:
drivers/char/tpm/tpm.c renamed from drivers/char/tpm/tpm.c~tpm-reorganize-sysfs-files-fix +2
-2@@ -180,7 +180,7 @@ static const u8 pcrread[] = {ssize_t tpm_show_pcrs (struct device *dev,struct device_attribute *attr,char *buf) { -u8 data[30 ]; +u8 data[ARRAY_SIZE (tpm_cap)];ssize_t rc;int i, j, num_pcrs;__be32 index;@@ -296,7 +296,7 @@ static const u8 cap_version[] = {ssize_t tpm_show_caps (struct device *dev,struct device_attribute *attr,char *buf) { -u8 data[30 ]; +u8 data[max (ARRAY_SIZE (tpm_cap),ARRAY_SIZE (cap_version))];ssize_t rc;char *str = buf;_
Quoted 1 line
Does that look OK?
No this is not ok because in several of these cases the response to the command is longer than tpm_cap thus the reason for the hardcoded size. I can put in a max function though that compares the size of the response and the tpm_cap. The read functions will make sure the response does not overflow the buffer should that length ever change in the future.
Thanks,
Kylie
Quoted 5 lines · Kylene Jo Hall
Quoted 2 lines
Does that look OK?
No this is not ok because in several of these cases the response to the command is longer than
tpm_capthus the reason for the hardcoded size.
OK.
Quoted 4 lines
I can put in a max function though that compares the size of the response and the
tpm_cap. The read functions will make sure the response does not overflow the buffer should that length ever change in the future.
Well, pretty much anything which will automatically increase the size of that array in response to changing data structures would suit, thanks.
PATCH 1/1 tpm: sysfs function buffer size fix
Quoted 9 lines · Andrew Morton
Quoted 5 lines · Kylene Jo Hall
Quoted 2 lines
Does that look OK?
No this is not ok because in several of these cases the response to the command is longer than
tpm_capthus the reason for the hardcoded size.OK.
Quoted 7 lines
Quoted 4 lines
I can put in a max function though that compares the size of the response and the
tpm_cap. The read functions will make sure the response does not overflow the buffer should that length ever change in the future.Well, pretty much anything which will automatically increase the size of that array in response to changing data structures would suit, thanks.
Will do. Fixed in this patch for all the sysfs files.
This patch will determine the size of the buffer in the sysfs functions based on the size of the command structure(s), such as tpm_cap, and the known amount of data the command will return. The receive functions are smart enough not to overflow the buffer should the command response change.
--- drivers/char/tpm/tpm.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-)
drivers/char/tpm/tpm.c +7 -8
@@ -490,7 +490,7 @@ static ssize_t transmit_cmd(struct tpm_cvoid tpm_gen_interrupt (struct tpm_chip *chip) { -u8 data[30 ]; +u8 data[max (ARRAY_SIZE (tpm_cap),30 )];ssize_t rc;memcpy (data, tpm_cap,sizeof (tpm_cap));
@@ -504,7 +504,7 @@ EXPORT_SYMBOL_GPL(tpm_gen_interrupt);void tpm_get_timeouts (struct tpm_chip *chip) { -u8 data[30 ]; +u8 data[max (ARRAY_SIZE (TPM_CAP ),30 )];ssize_t rc;u32 timeout;
@@ -564,7 +564,6 @@ EXPORT_SYMBOL_GPL(tpm_get_timeouts);void tpm_continue_selftest (struct tpm_chip *chip) { -u8 data[] = {0 ,193 ,/* TPM_TAG_RQU_COMMAND */ 0 ,0 ,0 ,10 ,/* length */
@@ -578,7 +577,7 @@ EXPORT_SYMBOL_GPL(tpm_continue_selftest)ssize_t tpm_show_enabled (struct device * dev,struct device_attribute * attr,char *buf) { -u8 data[35 ]; +u8 data[max (ARRAY_SIZE (tpm_cap),30 )];ssize_t rc;struct tpm_chip *chip =dev_get_drvdata (dev);
@@ -600,7 +599,7 @@ EXPORT_SYMBOL_GPL(tpm_show_enabled);ssize_t tpm_show_active (struct device * dev,struct device_attribute * attr,char *buf) { -u8 data[35 ]; +u8 data[max (ARRAY_SIZE (tpm_cap),35 )];ssize_t rc;struct tpm_chip *chip =dev_get_drvdata (dev);
@@ -673,7 +672,7 @@ static const u8 pcrread[] = {ssize_t tpm_show_pcrs (struct device *dev,struct device_attribute *attr,char *buf) { -u8 data[30 ]; +u8 data[max (max (ARRAY_SIZE (tpm_cap),ARRAY_SIZE (pcrread)),30 )];ssize_t rc;int i, j, num_pcrs;__be32 index;
@@ -790,7 +789,7 @@ static const u8 cap_version[] = {ssize_t tpm_show_caps (struct device *dev,struct device_attribute *attr,char *buf) { -u8 data[30 ]; +u8 data[max (max (ARRAY_SIZE (tpm_cap),ARRAY_SIZE (cap_version)),30 )];ssize_t rc;char *str = buf;
@@ -830,7 +829,7 @@ EXPORT_SYMBOL_GPL(tpm_show_caps);ssize_t tpm_show_caps_1_2 (struct device * dev,struct device_attribute * attr,char *buf) { -u8 data[30 ]; +u8 data[max (max (ARRAY_SIZE (tpm_cap),ARRAY_SIZE (cap_version)),30 )];ssize_t len;char *str = buf;
Re: [PATCH] tpm: sysfs function buffer size fix
Hi Kylene,
Quoted 12 lines · Kylene Jo Hall
drivers/char/tpm/tpm.c +1
-1@@ -490,7 +490,7 @@ static ssize_t transmit_cmd(struct tpm_cvoid tpm_gen_interrupt (struct tpm_chip *chip) { -u8 data[30 ]; +u8 data[max (ARRAY_SIZE (tpm_cap),30 )];ssize_t rc;memcpy (data, tpm_cap,sizeof (tpm_cap));
drivers/char/tpm/tpm.c EXPORT_SYMBOL_GPL(tpm_gen_interrupt); · line 510
Quoted 8 lines
drivers/char/tpm/tpm.c +1
-1@@ -504,7 +504,7 @@ EXPORT_SYMBOL_GPL(tpm_gen_interrupt);void tpm_get_timeouts (struct tpm_chip *chip) { -u8 data[30 ]; +u8 data[max (ARRAY_SIZE (TPM_CAP ),30 )];ssize_t rc;u32 timeout;
Once in ALL CAPS and once in lower case?
Sure about these?
Regards
Ingo Oeser
Re: [PATCH] tpm: sysfs function buffer size fix
Quoted 2 lines · Ingo Oeser
Once in ALL CAPS and once in lower case?
Sure about these?
Just found this one myself. Here is the fix.
This patch will determine the size of the buffer in the sysfs functions based on the size of the command structure(s), such as tpm_cap, and the known amount of data the command will return. The receive functions are smart enough not to overflow the buffer should the command response change.
--- drivers/char/tpm/tpm.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-)
drivers/char/tpm/tpm.c +7 -8
@@ -490,7 +490,7 @@ static ssize_t transmit_cmd(struct tpm_cvoid tpm_gen_interrupt (struct tpm_chip *chip) { -u8 data[30 ]; +u8 data[max (ARRAY_SIZE (tpm_cap),30 )];ssize_t rc;memcpy (data, tpm_cap,sizeof (tpm_cap));
@@ -504,7 +504,7 @@ EXPORT_SYMBOL_GPL(tpm_gen_interrupt);void tpm_get_timeouts (struct tpm_chip *chip) { -u8 data[30 ]; +u8 data[max (ARRAY_SIZE (tpm_cap),30 )];ssize_t rc;u32 timeout;
@@ -564,7 +564,6 @@ EXPORT_SYMBOL_GPL(tpm_get_timeouts);void tpm_continue_selftest (struct tpm_chip *chip) { -u8 data[] = {0 ,193 ,/* TPM_TAG_RQU_COMMAND */ 0 ,0 ,0 ,10 ,/* length */
@@ -578,7 +577,7 @@ EXPORT_SYMBOL_GPL(tpm_continue_selftest)ssize_t tpm_show_enabled (struct device * dev,struct device_attribute * attr,char *buf) { -u8 data[35 ]; +u8 data[max (ARRAY_SIZE (tpm_cap),30 )];ssize_t rc;struct tpm_chip *chip =dev_get_drvdata (dev);
@@ -600,7 +599,7 @@ EXPORT_SYMBOL_GPL(tpm_show_enabled);ssize_t tpm_show_active (struct device * dev,struct device_attribute * attr,char *buf) { -u8 data[35 ]; +u8 data[max (ARRAY_SIZE (tpm_cap),35 )];ssize_t rc;struct tpm_chip *chip =dev_get_drvdata (dev);
@@ -673,7 +672,7 @@ static const u8 pcrread[] = {ssize_t tpm_show_pcrs (struct device *dev,struct device_attribute *attr,char *buf) { -u8 data[30 ]; +u8 data[max (max (ARRAY_SIZE (tpm_cap),ARRAY_SIZE (pcrread)),30 )];ssize_t rc;int i, j, num_pcrs;__be32 index;
@@ -790,7 +789,7 @@ static const u8 cap_version[] = {ssize_t tpm_show_caps (struct device *dev,struct device_attribute *attr,char *buf) { -u8 data[30 ]; +u8 data[max (max (ARRAY_SIZE (tpm_cap),ARRAY_SIZE (cap_version)),30 )];ssize_t rc;char *str = buf;
@@ -830,7 +829,7 @@ EXPORT_SYMBOL_GPL(tpm_show_caps);ssize_t tpm_show_caps_1_2 (struct device * dev,struct device_attribute * attr,char *buf) { -u8 data[30 ]; +u8 data[max (max (ARRAY_SIZE (tpm_cap),ARRAY_SIZE (cap_version)),30 )];ssize_t len;char *str = buf;
PATCH 1/1 tpm: compiler cleanup
Fix compiler warnings about strict type checking with the max macro.
--- drivers/char/tpm/tpm.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-)
drivers/char/tpm/tpm.c +7 -7
@@ -490,7 +490,7 @@ static ssize_t transmit_cmd(struct tpm_cvoid tpm_gen_interrupt (struct tpm_chip *chip) { -u8 data[max (ARRAY_SIZE (tpm_cap),30 )]; +u8 data[max_t (int,ARRAY_SIZE (tpm_cap),30 )];ssize_t rc;memcpy (data, tpm_cap,sizeof (tpm_cap));
@@ -504,7 +504,7 @@ EXPORT_SYMBOL_GPL(tpm_gen_interrupt);void tpm_get_timeouts (struct tpm_chip *chip) { -u8 data[max (ARRAY_SIZE (TPM_CAP ),30 )]; +u8 data[max_t (int,ARRAY_SIZE (tpm_cap),30 )];ssize_t rc;u32 timeout;
@@ -577,7 +577,7 @@ EXPORT_SYMBOL_GPL(tpm_continue_selftest)ssize_t tpm_show_enabled (struct device * dev,struct device_attribute * attr,char *buf) { -u8 data[max (ARRAY_SIZE (tpm_cap),30 )]; +u8 data[max_t (int,ARRAY_SIZE (tpm_cap),30 )];ssize_t rc;struct tpm_chip *chip =dev_get_drvdata (dev);
@@ -599,7 +599,7 @@ EXPORT_SYMBOL_GPL(tpm_show_enabled);ssize_t tpm_show_active (struct device * dev,struct device_attribute * attr,char *buf) { -u8 data[max (ARRAY_SIZE (tpm_cap),35 )]; +u8 data[max_t (int,ARRAY_SIZE (tpm_cap),35 )];ssize_t rc;struct tpm_chip *chip =dev_get_drvdata (dev);
@@ -672,7 +672,7 @@ static const u8 pcrread[] = {ssize_t tpm_show_pcrs (struct device *dev,struct device_attribute *attr,char *buf) { -u8 data[max (max (ARRAY_SIZE (tpm_cap),ARRAY_SIZE (pcrread)),30 )]; +u8 data[max_t (int,max (ARRAY_SIZE (tpm_cap),ARRAY_SIZE (pcrread)),30 )];ssize_t rc;int i, j, num_pcrs;__be32 index;
@@ -789,7 +789,7 @@ static const u8 cap_version[] = {ssize_t tpm_show_caps (struct device *dev,struct device_attribute *attr,char *buf) { -u8 data[max (max (ARRAY_SIZE (tpm_cap),ARRAY_SIZE (cap_version)),30 )]; +u8 data[max_t (int,max (ARRAY_SIZE (tpm_cap),ARRAY_SIZE (cap_version)),30 )];ssize_t rc;char *str = buf;
@@ -829,7 +829,7 @@ EXPORT_SYMBOL_GPL(tpm_show_caps);ssize_t tpm_show_caps_1_2 (struct device * dev,struct device_attribute * attr,char *buf) { -u8 data[max (max (ARRAY_SIZE (tpm_cap),ARRAY_SIZE (cap_version)),30 )]; +u8 data[max_t (int,max (ARRAY_SIZE (tpm_cap),ARRAY_SIZE (cap_version)),30 )];ssize_t len;char *str = buf;