redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

tpm: sanitize constant expressions 

Use cpu_to_b32 at the time it is needed in enum tpm_capabilities and
enum tpm_sub_capabilities in order to be consistent with the other
enums in drivats/char/tpm/tpm.h.

Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
hifive-unleashed-5.1
Jarkko Sakkinen 2016-09-19 23:22:09 +03:00
parent aaa6f7f6c8
commit 84fda15286
3 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/char/tpm/tpm-interface.c
View File

@ -442,26 +442,29 @@ static const struct tpm_input_header tpm_getcap_header = {
.ordinal = TPM_ORD_GET_CAP .ordinal = TPM_ORD_GET_CAP
}; };
ssize_t tpm_getcap(struct tpm_chip *chip, __be32 subcap_id, cap_t *cap, ssize_t tpm_getcap(struct tpm_chip *chip, u32 subcap_id, cap_t *cap,
const char *desc) const char *desc)
{ {
struct tpm_cmd_t tpm_cmd; struct tpm_cmd_t tpm_cmd;
int rc; int rc;
tpm_cmd.header.in = tpm_getcap_header; tpm_cmd.header.in = tpm_getcap_header;
if (subcap_id == CAP_VERSION_1_1 || subcap_id == CAP_VERSION_1_2) { if (subcap_id == TPM_CAP_VERSION_1_1 ||
tpm_cmd.params.getcap_in.cap = subcap_id; subcap_id == TPM_CAP_VERSION_1_2) {
tpm_cmd.params.getcap_in.cap = cpu_to_be32(subcap_id);
/*subcap field not necessary */ /*subcap field not necessary */
tpm_cmd.params.getcap_in.subcap_size = cpu_to_be32(0); tpm_cmd.params.getcap_in.subcap_size = cpu_to_be32(0);
tpm_cmd.header.in.length -= cpu_to_be32(sizeof(__be32)); tpm_cmd.header.in.length -= cpu_to_be32(sizeof(__be32));
} else { } else {
if (subcap_id == TPM_CAP_FLAG_PERM || if (subcap_id == TPM_CAP_FLAG_PERM ||
subcap_id == TPM_CAP_FLAG_VOL) subcap_id == TPM_CAP_FLAG_VOL)
tpm_cmd.params.getcap_in.cap = TPM_CAP_FLAG; tpm_cmd.params.getcap_in.cap =
cpu_to_be32(TPM_CAP_FLAG);
else else
tpm_cmd.params.getcap_in.cap = TPM_CAP_PROP; tpm_cmd.params.getcap_in.cap =
cpu_to_be32(TPM_CAP_PROP);
tpm_cmd.params.getcap_in.subcap_size = cpu_to_be32(4); tpm_cmd.params.getcap_in.subcap_size = cpu_to_be32(4);
tpm_cmd.params.getcap_in.subcap = subcap_id; tpm_cmd.params.getcap_in.subcap = cpu_to_be32(subcap_id);
} }
rc = tpm_transmit_cmd(chip, &tpm_cmd, TPM_INTERNAL_RESULT_SIZE, 0, rc = tpm_transmit_cmd(chip, &tpm_cmd, TPM_INTERNAL_RESULT_SIZE, 0,
desc); desc);

4
drivers/char/tpm/tpm-sysfs.c
View File

@ -193,7 +193,7 @@ static ssize_t caps_show(struct device *dev, struct device_attribute *attr,
be32_to_cpu(cap.manufacturer_id)); be32_to_cpu(cap.manufacturer_id));
/* Try to get a TPM version 1.2 TPM_CAP_VERSION_INFO */ /* Try to get a TPM version 1.2 TPM_CAP_VERSION_INFO */
rc = tpm_getcap(chip, CAP_VERSION_1_2, &cap, rc = tpm_getcap(chip, TPM_CAP_VERSION_1_2, &cap,
"attempting to determine the 1.2 version"); "attempting to determine the 1.2 version");
if (!rc) { if (!rc) {
str += sprintf(str, str += sprintf(str,
@ -204,7 +204,7 @@ static ssize_t caps_show(struct device *dev, struct device_attribute *attr,
cap.tpm_version_1_2.revMinor); cap.tpm_version_1_2.revMinor);
} else { } else {
/* Otherwise just use TPM_STRUCT_VER */ /* Otherwise just use TPM_STRUCT_VER */
rc = tpm_getcap(chip, CAP_VERSION_1_1, &cap, rc = tpm_getcap(chip, TPM_CAP_VERSION_1_1, &cap,
"attempting to determine the 1.1 version"); "attempting to determine the 1.1 version");
if (rc) if (rc)
return 0; return 0;

25
drivers/char/tpm/tpm.h
View File

@ -282,21 +282,20 @@ typedef union {
} cap_t; } cap_t;
enum tpm_capabilities { enum tpm_capabilities {
TPM_CAP_FLAG = cpu_to_be32(4), TPM_CAP_FLAG = 4,
TPM_CAP_PROP = cpu_to_be32(5), TPM_CAP_PROP = 5,
CAP_VERSION_1_1 = cpu_to_be32(0x06), TPM_CAP_VERSION_1_1 = 0x06,
CAP_VERSION_1_2 = cpu_to_be32(0x1A) TPM_CAP_VERSION_1_2 = 0x1A,
}; };
enum tpm_sub_capabilities { enum tpm_sub_capabilities {
TPM_CAP_PROP_PCR = cpu_to_be32(0x101), TPM_CAP_PROP_PCR = 0x101,
TPM_CAP_PROP_MANUFACTURER = cpu_to_be32(0x103), TPM_CAP_PROP_MANUFACTURER = 0x103,
TPM_CAP_FLAG_PERM = cpu_to_be32(0x108), TPM_CAP_FLAG_PERM = 0x108,
TPM_CAP_FLAG_VOL = cpu_to_be32(0x109), TPM_CAP_FLAG_VOL = 0x109,
TPM_CAP_PROP_OWNER = cpu_to_be32(0x111), TPM_CAP_PROP_OWNER = 0x111,
TPM_CAP_PROP_TIS_TIMEOUT = cpu_to_be32(0x115), TPM_CAP_PROP_TIS_TIMEOUT = 0x115,
TPM_CAP_PROP_TIS_DURATION = cpu_to_be32(0x120), TPM_CAP_PROP_TIS_DURATION = 0x120,
}; };
struct tpm_getcap_params_in { struct tpm_getcap_params_in {
@ -484,7 +483,7 @@ ssize_t tpm_transmit(struct tpm_chip *chip, const u8 *buf, size_t bufsiz,
unsigned int flags); unsigned int flags);
ssize_t tpm_transmit_cmd(struct tpm_chip *chip, const void *cmd, int len, ssize_t tpm_transmit_cmd(struct tpm_chip *chip, const void *cmd, int len,
unsigned int flags, const char *desc); unsigned int flags, const char *desc);
ssize_t tpm_getcap(struct tpm_chip *chip, __be32 subcap_id, cap_t *cap, ssize_t tpm_getcap(struct tpm_chip *chip, u32 subcap_id, cap_t *cap,
const char *desc); const char *desc);
int tpm_get_timeouts(struct tpm_chip *); int tpm_get_timeouts(struct tpm_chip *);
int tpm1_auto_startup(struct tpm_chip *chip); int tpm1_auto_startup(struct tpm_chip *chip);