frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

os: Fix iteration over busfaults 

Fixes a regression from

commit 41da295eb5
Author: Keith Packard <keithp@keithp.com>
Date:   Sun Nov 3 13:12:40 2013 -0800

    Trap SIGBUS to handle truncated shared memory segments

that causes the SIGBUS handler to fail to chain up correctly and
corrupts nearby memory instead.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Chris Wilson 2017-02-17 08:18:52 +00:00 committed by Peter Hutterer
parent dcb63deb1b
commit acdb5bf2de
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
os/busfault.c
View File

@ -98,15 +98,16 @@ static void
busfault_sigaction(int sig, siginfo_t *info, void *param) busfault_sigaction(int sig, siginfo_t *info, void *param)
{ {
void *fault = info->si_addr; void *fault = info->si_addr;
struct busfault *busfault = NULL; struct busfault *iter, *busfault = NULL;
void *new_addr; void *new_addr;
/* Locate the faulting address in our list of shared segments /* Locate the faulting address in our list of shared segments
*/ */
xorg_list_for_each_entry(busfault, &busfaults, list) { xorg_list_for_each_entry(iter, &busfaults, list) {
if ((char *) busfault->addr <= (char *) fault && (char *) fault < (char *) busfault->addr + busfault->size) { if ((char *) iter->addr <= (char *) fault && (char *) fault < (char *) iter->addr + iter->size) {
break; busfault = iter;
} break;
}
} }
if (!busfault) if (!busfault)
goto panic; goto panic;
@ -132,7 +133,7 @@ panic:
if (previous_busfault_sigaction) if (previous_busfault_sigaction)
(*previous_busfault_sigaction)(sig, info, param); (*previous_busfault_sigaction)(sig, info, param);
else else
FatalError("bus error"); FatalError("bus error\n");
} }
Bool Bool