mirrors/micropython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unix/modmachine: Handle repeated /dev/mem open errors.

Browse Source 
If opening of /dev/mem has failed an `OSError` is appropriately raised, but
the next time `mem8/16/32` is accessed the invalid file descriptor is used
and the program gets a SIGSEGV.
This commit is contained in:
Yonatan Goldschmidt 2019-02-10 00:36:08 +02:00 committed by Damien George
parent 812969d615
commit 66f0afc91d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ports/unix/modmachine.c
View File

@ -57,10 +57,11 @@ uintptr_t mod_machine_mem_get_addr(mp_obj_t addr_o, uint align) {
static uintptr_t last_base = (uintptr_t)-1;
static uintptr_t map_page;
if (!fd) {
fd = open("/dev/mem", O_RDWR | O_SYNC);
if (fd == -1) {
int _fd = open("/dev/mem", O_RDWR | O_SYNC);
if (_fd == -1) {
mp_raise_OSError(errno);
}
fd = _fd;
}
uintptr_t cur_base = addr & ~MICROPY_PAGE_MASK;