Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ead7a22e authored by Heiko Carstens's avatar Heiko Carstens
Browse files

s390: avoid undefined behaviour 



At a couple of places smatch emits warnings like this:

    arch/s390/mm/vmem.c:409 vmem_map_init() warn:
        right shifting more than type allows

In fact shifting a signed type right is undefined. Avoid this and add
an unsigned long cast. The shifted values are always positive.

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
parent 8bc1e4ec

arch/s390/mm/init.c

+2 −2
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ void __init mem_init(void) 
void free_initmem(void)

{

	__set_memory((unsigned long)_sinittext,

		     (_einittext - _sinittext) >> PAGE_SHIFT,

		     (unsigned long)(_einittext - _sinittext) >> PAGE_SHIFT,

		     SET_MEMORY_RW | SET_MEMORY_NX);

	free_initmem_default(POISON_FREE_INITMEM);

}

arch/s390/mm/vmem.c

+7 −7
Original line number Diff line number Diff line
@@ -403,16 +403,16 @@ void __init vmem_map_init(void) 
	for_each_memblock(memory, reg)

		vmem_add_mem(reg->base, reg->size);

	__set_memory((unsigned long)_stext,

		     (_etext - _stext) >> PAGE_SHIFT,

		     (unsigned long)(_etext - _stext) >> PAGE_SHIFT,

		     SET_MEMORY_RO | SET_MEMORY_X);

	__set_memory((unsigned long)_etext,

		     (__end_rodata - _etext) >> PAGE_SHIFT,

		     (unsigned long)(__end_rodata - _etext) >> PAGE_SHIFT,

		     SET_MEMORY_RO);

	__set_memory((unsigned long)_sinittext,

		     (_einittext - _sinittext) >> PAGE_SHIFT,

		     (unsigned long)(_einittext - _sinittext) >> PAGE_SHIFT,

		     SET_MEMORY_RO | SET_MEMORY_X);

	pr_info("Write protected kernel read-only data: %luk\n",

		(__end_rodata - _stext) >> 10);

		(unsigned long)(__end_rodata - _stext) >> 10);

}



/*