Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'parisc-for-6.18-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc fix from Helge Deller:
- fix crash triggered by unaligned access in parisc unwinder
* tag 'parisc-for-6.18-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: Avoid crash due to unaligned access in unwinder
+10
-3
+10
-3
arch/parisc/kernel/unwind.c
+10
-3
arch/parisc/kernel/unwind.c
···
35
35
36
36
#define KERNEL_START (KERNEL_BINARY_TEXT_START)
37
37
38
+
#define ALIGNMENT_OK(ptr, type) (((ptr) & (sizeof(type) - 1)) == 0)
39
+
38
40
extern struct unwind_table_entry __start___unwind[];
39
41
extern struct unwind_table_entry __stop___unwind[];
40
42
···
259
257
if (pc_is_kernel_fn(pc, _switch_to) ||
260
258
pc == (unsigned long)&_switch_to_ret) {
261
259
info->prev_sp = info->sp - CALLEE_SAVE_FRAME_SIZE;
262
-
info->prev_ip = *(unsigned long *)(info->prev_sp - RP_OFFSET);
260
+
if (ALIGNMENT_OK(info->prev_sp, long))
261
+
info->prev_ip = *(unsigned long *)(info->prev_sp - RP_OFFSET);
262
+
else
263
+
info->prev_ip = info->prev_sp = 0;
263
264
return 1;
264
265
}
265
266
266
267
#ifdef CONFIG_IRQSTACKS
267
-
if (pc == (unsigned long)&_call_on_stack) {
268
+
if (pc == (unsigned long)&_call_on_stack && ALIGNMENT_OK(info->sp, long)) {
268
269
info->prev_sp = *(unsigned long *)(info->sp - FRAME_SIZE - REG_SZ);
269
270
info->prev_ip = *(unsigned long *)(info->sp - FRAME_SIZE - RP_OFFSET);
270
271
return 1;
···
375
370
info->prev_sp = info->sp - frame_size;
376
371
if (e->Millicode)
377
372
info->rp = info->r31;
378
-
else if (rpoffset)
373
+
else if (rpoffset && ALIGNMENT_OK(info->prev_sp, long))
379
374
info->rp = *(unsigned long *)(info->prev_sp - rpoffset);
375
+
else
376
+
info->rp = 0;
380
377
info->prev_ip = info->rp;
381
378
info->rp = 0;
382
379
}