LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sandbox: Unprotect DATA regions in bus tests 

On my Ubuntu 18.04.1 machine two driver-model bus tests have started
failing recently. The problem appears to be that the DATA region of the
executable is protected. This does not seem correct, but perhaps there
is a reason.

To work around it, unprotect the regions in these tests before accessing
them.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2018-10-01 21:12:32 -06:00
parent 0a60a81ba3
commit 9f8037ea9c
3 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/sandbox/cpu/os.c
View File

@ -636,3 +636,14 @@ void os_abort(void)
{ {
abort(); abort();
} }
int os_mprotect_allow(void *start, size_t len)
{
int page_size = getpagesize();
/* Move start to the start of a page, len to the end */
start = (void *)(((ulong)start) & ~(page_size - 1));
len = (len + page_size * 2) & ~(page_size - 1);
return mprotect(start, len, PROT_READ | PROT_WRITE);
}

12
include/os.h
View File

@ -334,4 +334,16 @@ void os_localtime(struct rtc_time *rt);
* os_abort() - Raise SIGABRT to exit sandbox (e.g. to debugger) * os_abort() - Raise SIGABRT to exit sandbox (e.g. to debugger)
*/ */
void os_abort(void); void os_abort(void);
/**
* os_mprotect_allow() - Remove write-protection on a region of memory
*
* The start and length will be page-aligned before use.
*
* @start: Region start
* @len: Region length in bytes
* @return 0 if OK, -1 on error from mprotect()
*/
int os_mprotect_allow(void *start, size_t len);
#endif #endif

12
test/dm/bus.c
View File

@ -4,6 +4,9 @@
*/ */
#include <common.h> #include <common.h>
#ifdef CONFIG_SANDBOX
#include <os.h>
#endif
#include <dm.h> #include <dm.h>
#include <dm/device-internal.h> #include <dm/device-internal.h>
#include <dm/test.h> #include <dm/test.h>
@ -297,6 +300,11 @@ static int dm_test_bus_parent_data_uclass(struct unit_test_state *uts)
ut_assertok(uclass_find_device(UCLASS_TEST_BUS, 0, &bus)); ut_assertok(uclass_find_device(UCLASS_TEST_BUS, 0, &bus));
drv = (struct driver *)bus->driver; drv = (struct driver *)bus->driver;
size = drv->per_child_auto_alloc_size; size = drv->per_child_auto_alloc_size;
#ifdef CONFIG_SANDBOX
os_mprotect_allow(bus->uclass->uc_drv, sizeof(*bus->uclass->uc_drv));
os_mprotect_allow(drv, sizeof(*drv));
#endif
bus->uclass->uc_drv->per_child_auto_alloc_size = size; bus->uclass->uc_drv->per_child_auto_alloc_size = size;
drv->per_child_auto_alloc_size = 0; drv->per_child_auto_alloc_size = 0;
ret = test_bus_parent_data(uts); ret = test_bus_parent_data(uts);
@ -440,6 +448,10 @@ static int dm_test_bus_parent_platdata_uclass(struct unit_test_state *uts)
ut_assertok(uclass_find_device(UCLASS_TEST_BUS, 0, &bus)); ut_assertok(uclass_find_device(UCLASS_TEST_BUS, 0, &bus));
drv = (struct driver *)bus->driver; drv = (struct driver *)bus->driver;
size = drv->per_child_platdata_auto_alloc_size; size = drv->per_child_platdata_auto_alloc_size;
#ifdef CONFIG_SANDBOX
os_mprotect_allow(bus->uclass->uc_drv, sizeof(*bus->uclass->uc_drv));
os_mprotect_allow(drv, sizeof(*drv));
#endif
bus->uclass->uc_drv->per_child_platdata_auto_alloc_size = size; bus->uclass->uc_drv->per_child_platdata_auto_alloc_size = size;
drv->per_child_platdata_auto_alloc_size = 0; drv->per_child_platdata_auto_alloc_size = 0;
ret = test_bus_parent_platdata(uts); ret = test_bus_parent_platdata(uts);