summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--etc/less.profile4
-rw-r--r--etc/youtube-dl.profile1
-rw-r--r--src/libpostexecseccomp/libpostexecseccomp.c4
-rw-r--r--src/libtrace/libtrace.c9
4 files changed, 5 insertions, 13 deletions
diff --git a/etc/less.profile b/etc/less.profile
index e6366ad28..0f31d344b 100644
--- a/etc/less.profile
+++ b/etc/less.profile
@@ -8,13 +8,13 @@ include less.local
8include globals.local 8include globals.local
9 9
10noblacklist ${HOME}/.lesshst 10noblacklist ${HOME}/.lesshst
11read-only ${HOME}
12read-write ${HOME}/.lesshst
11 13
12include disable-common.inc
13include disable-devel.inc 14include disable-devel.inc
14include disable-exec.inc 15include disable-exec.inc
15include disable-interpreters.inc 16include disable-interpreters.inc
16include disable-passwdmgr.inc 17include disable-passwdmgr.inc
17include disable-programs.inc
18 18
19apparmor 19apparmor
20caps.drop all 20caps.drop all
diff --git a/etc/youtube-dl.profile b/etc/youtube-dl.profile
index f7cb34b3f..6fc519bee 100644
--- a/etc/youtube-dl.profile
+++ b/etc/youtube-dl.profile
@@ -49,7 +49,6 @@ seccomp
49shell none 49shell none
50tracelog 50tracelog
51 51
52disable-mnt
53private-bin env,ffmpeg,python*,youtube-dl 52private-bin env,ffmpeg,python*,youtube-dl
54private-cache 53private-cache
55private-dev 54private-dev
diff --git a/src/libpostexecseccomp/libpostexecseccomp.c b/src/libpostexecseccomp/libpostexecseccomp.c
index 3983510ec..b2f64f18e 100644
--- a/src/libpostexecseccomp/libpostexecseccomp.c
+++ b/src/libpostexecseccomp/libpostexecseccomp.c
@@ -40,9 +40,7 @@ static void load_seccomp(void) {
40 return; 40 return;
41 } 41 }
42 unsigned short entries = (unsigned short) size / (unsigned short) sizeof(struct sock_filter); 42 unsigned short entries = (unsigned short) size / (unsigned short) sizeof(struct sock_filter);
43 struct sock_filter *filter = MAP_FAILED; 43 struct sock_filter *filter = mmap(NULL, size, PROT_READ, MAP_PRIVATE, fd, 0);
44 if (size != 0)
45 filter = mmap(NULL, size, PROT_READ, MAP_PRIVATE, fd, 0);
46 close(fd); 44 close(fd);
47 45
48 if (filter == MAP_FAILED) { 46 if (filter == MAP_FAILED) {
diff --git a/src/libtrace/libtrace.c b/src/libtrace/libtrace.c
index e252e9d26..1cab1ed3c 100644
--- a/src/libtrace/libtrace.c
+++ b/src/libtrace/libtrace.c
@@ -64,14 +64,9 @@ void init(void) {
64 strncpy(myname, "unknown", MAXNAME-1); 64 strncpy(myname, "unknown", MAXNAME-1);
65 65
66 // read file 66 // read file
67 FILE *fp = orig_fopen(fname, "r"); 67 FILE *fp = orig_fopen(fname, "r");
68 if (!fp) 68 if (!fp || fgets(myname, MAXNAME, fp) == NULL)
69 strncpy(myname, "unknown", MAXNAME-1); 69 strncpy(myname, "unknown", MAXNAME-1);
70 if (fgets(myname, MAXNAME, fp) == NULL) {
71 fclose(fp);
72 free(fname);
73 strncpy(myname, "unknown", MAXNAME-1);
74 }
75 70
76 // clean '\n' 71 // clean '\n'
77 char *ptr = strchr(myname, '\n'); 72 char *ptr = strchr(myname, '\n');