Unverified Commit cd78f9c5 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!14884 um: Fix potential integer overflow during physmem setup 

Merge Pull Request from: @ci-robot 
 
PR sync from: Tirui Yin <yintirui@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/D5FQIXGEUWFJXA2F6R2BOUHLEOFJ3SYP/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBDHGO 
 
Link:https://gitee.com/openeuler/kernel/pulls/14884

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 5036b0d0 f3c36774

arch/um/kernel/physmem.c

+3 −3
Original line number Diff line number Diff line
@@ -80,10 +80,10 @@ void __init setup_physmem(unsigned long start, unsigned long reserve_end, 
			  unsigned long len, unsigned long long highmem)

{

	unsigned long reserve = reserve_end - start;

	long map_size = len - reserve;

	unsigned long map_size = len - reserve;

	int err;



	if(map_size <= 0) {

	if (len <= reserve) {

		os_warn("Too few physical memory! Needed=%lu, given=%lu\n",

			reserve, len);

		exit(1);
@@ -94,7 +94,7 @@ void __init setup_physmem(unsigned long start, unsigned long reserve_end, 
	err = os_map_memory((void *) reserve_end, physmem_fd, reserve,

			    map_size, 1, 1, 1);

	if (err < 0) {

		os_warn("setup_physmem - mapping %ld bytes of memory at 0x%p "

		os_warn("setup_physmem - mapping %lu bytes of memory at 0x%p "

			"failed - errno = %d\n", map_size,

			(void *) reserve_end, err);

		exit(1);