michaelh/zephyr
1
0
Fork 0
Code Releases Activity

kernel: mem_domain: Fix compile issues

Browse source 
Commit 08de658eb ("kernel: mem_domain: Check for overlapping regions
when considering W^X") introduced some compile issues on various
platforms.

The k_mem_partition_attr_t member is attr not attrs.  Also, fix an issue
where sane_partition_domain neesd a pointer to a parition.

Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
This commit is contained in:
Kumar Gala 2018-03-05 10:13:39 -06:00 • committed by Kumar Gala
commit 8c9fe0d796
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
kernel/mem_domain.c
View file

@ -22,8 +22,8 @@ static bool sane_partition(const struct k_mem_partition *part,
u32_t i; u32_t i;
end = part->start + part->size; end = part->start + part->size;
exec = K_MEM_PARTITION_IS_EXECUTABLE(part->attrs); exec = K_MEM_PARTITION_IS_EXECUTABLE(part->attr);
write = K_MEM_PARTITION_IS_WRITABLE(part->attrs); write = K_MEM_PARTITION_IS_WRITABLE(part->attr);
if (exec && write) { if (exec && write) {
__ASSERT(0, "partition is writable and executable <start %x>", __ASSERT(0, "partition is writable and executable <start %x>",
@ -41,8 +41,8 @@ static bool sane_partition(const struct k_mem_partition *part,
continue; continue;
} }
cur_write = K_MEM_PARTITION_IS_WRITABLE(parts[i].attrs); cur_write = K_MEM_PARTITION_IS_WRITABLE(parts[i].attr);
cur_exec = K_MEM_PARTITION_IS_EXECUTABLE(parts[i].attrs); cur_exec = K_MEM_PARTITION_IS_EXECUTABLE(parts[i].attr);
if ((cur_write && exec) || (cur_exec && write)) { if ((cur_write && exec) || (cur_exec && write)) {
__ASSERT(0, "overlapping partitions are " __ASSERT(0, "overlapping partitions are "
@ -96,7 +96,7 @@ void k_mem_domain_init(struct k_mem_domain *domain, u8_t num_parts,
#if defined(CONFIG_EXECUTE_XOR_WRITE) #if defined(CONFIG_EXECUTE_XOR_WRITE)
for (i = 0; i < num_parts; i++) { for (i = 0; i < num_parts; i++) {
__ASSERT(sane_partition_domain(domain, __ASSERT(sane_partition_domain(domain,
domain->partitions[i]), &domain->partitions[i]),
""); "");
} }
#endif #endif