diff options
| author |   dean.yang_cp <yangdianqing@yulong.com> | 2021-02-23 10:00:31 +0800 |
|---|---|---|
| committer |   Vineet Gupta <vgupta@synopsys.com> | 2021-03-22 10:05:43 -0700 |
| commit | 83520d62cc5a94d2ff0e2d37c8204fca13dd2637 (patch) | |
| tree | 3da316975852789c1885e1456635939619298e27 /arch/arc | |
| parent | arc: kernel: Return -EFAULT if copy_to_user() fails (diff) | |
| download | linux-dev-83520d62cc5a94d2ff0e2d37c8204fca13dd2637.tar.xz linux-dev-83520d62cc5a94d2ff0e2d37c8204fca13dd2637.zip | |
ARC: treewide: avoid the pointer addition with NULL pointer
Signed-off-by: dean.yang_cp <yangdianqing@yulong.com>
Acked-by: Vineet Gupta <vgupta@synopsys.com>
Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
Diffstat (limited to 'arch/arc')
| -rw-r--r-- | arch/arc/kernel/unwind.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/arch/arc/kernel/unwind.c b/arch/arc/kernel/unwind.c index 74ad4256022e..47bab67f8649 100644 --- a/arch/arc/kernel/unwind.c +++ b/arch/arc/kernel/unwind.c @@ -187,25 +187,26 @@ static void init_unwind_table(struct unwind_table *table, const char *name, const void *table_start, unsigned long table_size, const u8 *header_start, unsigned long header_size) { - const u8 *ptr = header_start + 4; - const u8 *end = header_start + header_size; - table->core.pc = (unsigned long)core_start; table->core.range = core_size; table->init.pc = (unsigned long)init_start; table->init.range = init_size; table->address = table_start; table->size = table_size; - - /* See if the linker provided table looks valid. */ - if (header_size <= 4 - || header_start[0] != 1 - || (void *)read_pointer(&ptr, end, header_start[1]) != table_start - || header_start[2] == DW_EH_PE_omit - || read_pointer(&ptr, end, header_start[2]) <= 0 - || header_start[3] == DW_EH_PE_omit) - header_start = NULL; - + /* To avoid the pointer addition with NULL pointer.*/ + if (header_start != NULL) { + const u8 *ptr = header_start + 4; + const u8 *end = header_start + header_size; + /* See if the linker provided table looks valid. */ + if (header_size <= 4 + || header_start[0] != 1 + || (void *)read_pointer(&ptr, end, header_start[1]) + != table_start + || header_start[2] == DW_EH_PE_omit + || read_pointer(&ptr, end, header_start[2]) <= 0 + || header_start[3] == DW_EH_PE_omit) + header_start = NULL; + } table->hdrsz = header_size; smp_wmb(); table->header = header_start; |