2 files changed, 5 insertions, 6 deletions

diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
index f4c68abf2a15..aeafac5bde8c 100644
--- a/drivers/char/tpm/tpm.c
+++ b/drivers/char/tpm/tpm.c
@@ -696,7 +696,7 @@ int __tpm_pcr_read(struct tpm_chip *chip, int pcr_idx, u8 *res_buf)
 
         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);
+        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");
 
@@ -742,7 +742,7 @@ EXPORT_SYMBOL_GPL(tpm_pcr_read);
  * the module usage count.
  */
 #define TPM_ORD_PCR_EXTEND cpu_to_be32(20)
-#define EXTEND_PCR_SIZE 34
+#define EXTEND_PCR_RESULT_SIZE 34
 static struct tpm_input_header pcrextend_header = {
         .tag = TPM_TAG_RQU_COMMAND,
         .length = cpu_to_be32(34),
@@ -760,10 +760,9 @@ int tpm_pcr_extend(u32 chip_num, int pcr_idx, const u8 *hash)
                 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,
+        rc = transmit_cmd(chip, &cmd, EXTEND_PCR_RESULT_SIZE,
                           "attempting extend a PCR value");
 
         module_put(chip->dev->driver->owner);
diff --git a/drivers/char/tpm/tpm_bios.c b/drivers/char/tpm/tpm_bios.c
index 0c2f55a38b95..bf2170fb1cdd 100644
--- a/drivers/char/tpm/tpm_bios.c
+++ b/drivers/char/tpm/tpm_bios.c
@@ -343,14 +343,14 @@ static int tpm_ascii_bios_measurements_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static struct seq_operations tpm_ascii_b_measurments_seqops = {
+static const struct seq_operations tpm_ascii_b_measurments_seqops = {
         .start = tpm_bios_measurements_start,
         .next = tpm_bios_measurements_next,
         .stop = tpm_bios_measurements_stop,
         .show = tpm_ascii_bios_measurements_show,
 };
 
-static struct seq_operations tpm_binary_b_measurments_seqops = {
+static const struct seq_operations tpm_binary_b_measurments_seqops = {
         .start = tpm_bios_measurements_start,
         .next = tpm_bios_measurements_next,
         .stop = tpm_bios_measurements_stop,