aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar smitsohu <smitsohu@gmail.com>2019-02-06 16:08:38 +0100
committerLibravatar smitsohu <smitsohu@gmail.com>2019-02-06 16:08:38 +0100
commit8cfa7eac96505dfdee8bc1f23d669c539f39d0f6 (patch)
tree732894e002aba19a7f6c40bdc6391523d1feacac
parentfirejail.config fixes (diff)
downloadfirejail-8cfa7eac96505dfdee8bc1f23d669c539f39d0f6.tar.gz
firejail-8cfa7eac96505dfdee8bc1f23d669c539f39d0f6.tar.zst
firejail-8cfa7eac96505dfdee8bc1f23d669c539f39d0f6.zip
strncmp byte count fixes
-rw-r--r--src/faudit/seccomp.c4
-rw-r--r--src/fbuilder/build_home.c4
-rw-r--r--src/fbuilder/build_seccomp.c4
-rw-r--r--src/firejail/profile.c2
4 files changed, 7 insertions, 7 deletions
diff --git a/src/faudit/seccomp.c b/src/faudit/seccomp.c
index 85a883618..5d4ddb329 100644
--- a/src/faudit/seccomp.c
+++ b/src/faudit/seccomp.c
@@ -27,8 +27,8 @@ static int extract_seccomp(int *val) {
27 27
28 char buf[MAXBUF]; 28 char buf[MAXBUF];
29 while (fgets(buf, MAXBUF, fp)) { 29 while (fgets(buf, MAXBUF, fp)) {
30 if (strncmp(buf, "Seccomp:\t", 8) == 0) { 30 if (strncmp(buf, "Seccomp:\t", 9) == 0) {
31 char *ptr = buf + 8; 31 char *ptr = buf + 9;
32 int tmp; 32 int tmp;
33 sscanf(ptr, "%d", &tmp); 33 sscanf(ptr, "%d", &tmp);
34 *val = tmp; 34 *val = tmp;
diff --git a/src/fbuilder/build_home.c b/src/fbuilder/build_home.c
index 7470a8d10..1a2307910 100644
--- a/src/fbuilder/build_home.c
+++ b/src/fbuilder/build_home.c
@@ -111,7 +111,7 @@ void process_home(const char *fname, char *home, int home_len) {
111 // skip files handled automatically by firejail 111 // skip files handled automatically by firejail
112 if (strcmp(ptr, ".Xauthority") == 0 || 112 if (strcmp(ptr, ".Xauthority") == 0 ||
113 strcmp(ptr, ".Xdefaults-debian") == 0 || 113 strcmp(ptr, ".Xdefaults-debian") == 0 ||
114 strncmp(ptr, ".config/pulse/", 13) == 0 || 114 strncmp(ptr, ".config/pulse/", 14) == 0 ||
115 strncmp(ptr, ".pulse/", 7) == 0 || 115 strncmp(ptr, ".pulse/", 7) == 0 ||
116 strncmp(ptr, ".bash_hist", 10) == 0 || 116 strncmp(ptr, ".bash_hist", 10) == 0 ||
117 strcmp(ptr, ".bashrc") == 0) 117 strcmp(ptr, ".bashrc") == 0)
@@ -196,4 +196,4 @@ void build_home(const char *fname, FILE *fp) {
196 else 196 else
197 fprintf(fp, "private\n"); 197 fprintf(fp, "private\n");
198 198
199} \ No newline at end of file 199}
diff --git a/src/fbuilder/build_seccomp.c b/src/fbuilder/build_seccomp.c
index fbc0e06f4..b1f41a6c7 100644
--- a/src/fbuilder/build_seccomp.c
+++ b/src/fbuilder/build_seccomp.c
@@ -131,9 +131,9 @@ static void process_protocol(const char *fname) {
131 inet = 1; 131 inet = 1;
132 else if (strncmp(ptr, "AF_INET6 ", 9) == 0) 132 else if (strncmp(ptr, "AF_INET6 ", 9) == 0)
133 inet6 = 1; 133 inet6 = 1;
134 else if (strncmp(ptr, "AF_NETLINK ", 9) == 0) 134 else if (strncmp(ptr, "AF_NETLINK ", 11) == 0)
135 netlink = 1; 135 netlink = 1;
136 else if (strncmp(ptr, "AF_PACKET ", 9) == 0) 136 else if (strncmp(ptr, "AF_PACKET ", 10) == 0)
137 packet = 1; 137 packet = 1;
138 } 138 }
139 139
diff --git a/src/firejail/profile.c b/src/firejail/profile.c
index bc66aca78..af7b54596 100644
--- a/src/firejail/profile.c
+++ b/src/firejail/profile.c
@@ -869,7 +869,7 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
869 } 869 }
870 870
871 // nice value 871 // nice value
872 if (strncmp(ptr, "nice ", 4) == 0) { 872 if (strncmp(ptr, "nice ", 5) == 0) {
873 cfg.nice = atoi(ptr + 5); 873 cfg.nice = atoi(ptr + 5);
874 if (getuid() != 0 &&cfg.nice < 0) 874 if (getuid() != 0 &&cfg.nice < 0)
875 cfg.nice = 0; 875 cfg.nice = 0;