github-starred/firejail
2
0
Fork 0
mirror of https://github.com/netblue30/firejail.git synced 2026-05-21 06:45:29 -06:00
Code Issues 531 Projects Packages Wiki Activity Actions 1

Clean up some fragile uses of strncmp.

Browse source 
In some places the code compares the first n characters of a string and
then assumes a valid string starts from the n+2th character.  I didn't
find any places where this wasn't justifiable, but I think it's better
to stick to safer patterns, especially in SUID code.
This commit is contained in:
sarneaud 2015-09-01 10:34:26 +10:00
parent c400b75a70
commit 78fd72058f
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/firejail/caps.c
View file

@ -377,7 +377,7 @@ static uint64_t extract_caps(int pid) {
char buf[MAXBUF];
while (fgets(buf, MAXBUF, fp)) {
if (strncmp(buf, "CapBnd:", 7) == 0) {
if (strncmp(buf, "CapBnd:\t", 8) == 0) {
char *ptr = buf + 8;
unsigned long long val;
sscanf(ptr, "%llx", &val);

8
src/firejail/fs.c
View file

@ -246,7 +246,7 @@ void fs_blacklist(const char *homedir) {
char *ptr;
// process blacklist command
if (strncmp(entry->data, "bind", 4) == 0) {
if (strncmp(entry->data, "bind ", 5) == 0) {
char *dname1 = entry->data + 5;
char *dname2 = split_comma(dname1);
if (dname2 == NULL) {
@ -284,15 +284,15 @@ void fs_blacklist(const char *homedir) {
}
// process blacklist command
if (strncmp(entry->data, "blacklist", 9) == 0) {
if (strncmp(entry->data, "blacklist ", 10) == 0) {
ptr = entry->data + 10;
op = BLACKLIST_FILE;
}
else if (strncmp(entry->data, "read-only", 9) == 0) {
else if (strncmp(entry->data, "read-only ", 10) == 0) {
ptr = entry->data + 10;
op = MOUNT_READONLY;
}
else if (strncmp(entry->data, "tmpfs", 5) == 0) {
else if (strncmp(entry->data, "tmpfs ", 6) == 0) {
ptr = entry->data + 6;
op = MOUNT_TMPFS;
}