Commit 24c9ae23 authored by Roberto Sassu's avatar Roberto Sassu Committed by Mimi Zohar

ima: Set correct casting types

The code expects that the values being parsed from a buffer when the
ima_canonical_fmt global variable is true are in little endian. Thus, this
patch sets the casting types accordingly.
Reported-by: default avatarkernel test robot <lkp@intel.com>
Signed-off-by: default avatarRoberto Sassu <roberto.sassu@huawei.com>
Signed-off-by: default avatarMimi Zohar <zohar@linux.ibm.com>
parent 22a558f5
...@@ -423,9 +423,9 @@ int ima_restore_measurement_list(loff_t size, void *buf) ...@@ -423,9 +423,9 @@ int ima_restore_measurement_list(loff_t size, void *buf)
return 0; return 0;
if (ima_canonical_fmt) { if (ima_canonical_fmt) {
khdr->version = le16_to_cpu(khdr->version); khdr->version = le16_to_cpu((__force __le16)khdr->version);
khdr->count = le64_to_cpu(khdr->count); khdr->count = le64_to_cpu((__force __le64)khdr->count);
khdr->buffer_size = le64_to_cpu(khdr->buffer_size); khdr->buffer_size = le64_to_cpu((__force __le64)khdr->buffer_size);
} }
if (khdr->version != 1) { if (khdr->version != 1) {
...@@ -515,7 +515,7 @@ int ima_restore_measurement_list(loff_t size, void *buf) ...@@ -515,7 +515,7 @@ int ima_restore_measurement_list(loff_t size, void *buf)
} }
entry->pcr = !ima_canonical_fmt ? *(u32 *)(hdr[HDR_PCR].data) : entry->pcr = !ima_canonical_fmt ? *(u32 *)(hdr[HDR_PCR].data) :
le32_to_cpu(*(u32 *)(hdr[HDR_PCR].data)); le32_to_cpu(*(__le32 *)(hdr[HDR_PCR].data));
ret = ima_restore_measurement_entry(entry); ret = ima_restore_measurement_entry(entry);
if (ret < 0) if (ret < 0)
break; break;
......
...@@ -98,21 +98,21 @@ static void ima_show_template_data_ascii(struct seq_file *m, ...@@ -98,21 +98,21 @@ static void ima_show_template_data_ascii(struct seq_file *m,
case sizeof(u16): case sizeof(u16):
if (ima_canonical_fmt) if (ima_canonical_fmt)
seq_printf(m, "%u", seq_printf(m, "%u",
le16_to_cpu(*(u16 *)buf_ptr)); le16_to_cpu(*(__le16 *)buf_ptr));
else else
seq_printf(m, "%u", *(u16 *)buf_ptr); seq_printf(m, "%u", *(u16 *)buf_ptr);
break; break;
case sizeof(u32): case sizeof(u32):
if (ima_canonical_fmt) if (ima_canonical_fmt)
seq_printf(m, "%u", seq_printf(m, "%u",
le32_to_cpu(*(u32 *)buf_ptr)); le32_to_cpu(*(__le32 *)buf_ptr));
else else
seq_printf(m, "%u", *(u32 *)buf_ptr); seq_printf(m, "%u", *(u32 *)buf_ptr);
break; break;
case sizeof(u64): case sizeof(u64):
if (ima_canonical_fmt) if (ima_canonical_fmt)
seq_printf(m, "%llu", seq_printf(m, "%llu",
le64_to_cpu(*(u64 *)buf_ptr)); le64_to_cpu(*(__le64 *)buf_ptr));
else else
seq_printf(m, "%llu", *(u64 *)buf_ptr); seq_printf(m, "%llu", *(u64 *)buf_ptr);
break; break;
...@@ -226,9 +226,10 @@ int ima_parse_buf(void *bufstartp, void *bufendp, void **bufcurp, ...@@ -226,9 +226,10 @@ int ima_parse_buf(void *bufstartp, void *bufendp, void **bufcurp,
if (bufp > (bufendp - sizeof(u32))) if (bufp > (bufendp - sizeof(u32)))
break; break;
fields[i].len = *(u32 *)bufp;
if (ima_canonical_fmt) if (ima_canonical_fmt)
fields[i].len = le32_to_cpu(fields[i].len); fields[i].len = le32_to_cpu(*(__le32 *)bufp);
else
fields[i].len = *(u32 *)bufp;
bufp += sizeof(u32); bufp += sizeof(u32);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment