mirrors/looking-glass
2
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-11-14 21:17:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[c-host] linux: remove extra shm device name validation

Browse source 
This is now validated by the option validator callback
This commit is contained in:
Geoffrey McRae 2019-05-11 11:59:26 +10:00
parent cf030f6f0c
commit 522bacb1f0
2 changed files with 24 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
VERSION
View file

@ -1 +1 @@
a12-176-g823164a924+1 a12-177-gcf030f6f0c+1

71
c-host/platform/Linux/src/platform.c
View file

@ -200,62 +200,37 @@ bool app_init()
{ {
const char * shmDevice = option_get_string("os", "shmDevice"); const char * shmDevice = option_get_string("os", "shmDevice");
// check the deice name
{
char * name = uioGetName(shmDevice);
if (!name)
{
DEBUG_ERROR("Failed to read the shmDevice name for: %s", shmDevice);
DEBUG_ERROR("Did you remmeber to modprobe the kvmfr module?");
return false;
}
if (strcmp(name, "KVMFR") != 0)
{
free(name);
DEBUG_ERROR("Device is not a KVMFR device \"%s\" reports as: %s", shmDevice, name);
return false;
}
free(name);
}
// get the device size // get the device size
int fd = uioOpenFile(shmDevice, "maps/map0/size");
if (fd < 0)
{ {
int fd = uioOpenFile(shmDevice, "maps/map0/size"); DEBUG_ERROR("Failed to open %s/size", shmDevice);
if (fd < 0) DEBUG_ERROR("Did you remmeber to modprobe the kvmfr module?");
{ return false;
DEBUG_ERROR("Failed to open %s/size", shmDevice);
DEBUG_ERROR("Did you remmeber to modprobe the kvmfr module?");
return false;
}
char size[32];
int len = read(fd, size, sizeof(size) - 1);
if (len <= 0)
{
DEBUG_ERROR("Failed to read the device size");
close(fd);
return false;
}
size[len] = '\0';
close(fd);
app.shmSize = strtoul(size, NULL, 16);
} }
char size[32];
int len = read(fd, size, sizeof(size) - 1);
if (len <= 0)
{
DEBUG_ERROR("Failed to read the device size");
close(fd);
return false;
}
size[len] = '\0';
close(fd);
app.shmSize = strtoul(size, NULL, 16);
// open the device // open the device
{ app.shmFD = shmOpenDev(shmDevice);
app.shmFD = shmOpenDev(shmDevice); app.shmMap = MAP_FAILED;
app.shmMap = MAP_FAILED; if (app.shmFD < 0)
if (app.shmFD < 0) return false;
return false;
DEBUG_INFO("KVMFR Device : %s", shmDevice); DEBUG_INFO("KVMFR Device : %s", shmDevice);
}
signal(SIGINT, sigHandler); signal(SIGINT, sigHandler);
return true; return true;
} }