diff options
-rw-r--r-- | etc/less.profile | 4 | ||||
-rw-r--r-- | etc/youtube-dl.profile | 1 | ||||
-rw-r--r-- | src/libpostexecseccomp/libpostexecseccomp.c | 4 | ||||
-rw-r--r-- | src/libtrace/libtrace.c | 9 |
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 | |||
8 | include globals.local | 8 | include globals.local |
9 | 9 | ||
10 | noblacklist ${HOME}/.lesshst | 10 | noblacklist ${HOME}/.lesshst |
11 | read-only ${HOME} | ||
12 | read-write ${HOME}/.lesshst | ||
11 | 13 | ||
12 | include disable-common.inc | ||
13 | include disable-devel.inc | 14 | include disable-devel.inc |
14 | include disable-exec.inc | 15 | include disable-exec.inc |
15 | include disable-interpreters.inc | 16 | include disable-interpreters.inc |
16 | include disable-passwdmgr.inc | 17 | include disable-passwdmgr.inc |
17 | include disable-programs.inc | ||
18 | 18 | ||
19 | apparmor | 19 | apparmor |
20 | caps.drop all | 20 | caps.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 | |||
49 | shell none | 49 | shell none |
50 | tracelog | 50 | tracelog |
51 | 51 | ||
52 | disable-mnt | ||
53 | private-bin env,ffmpeg,python*,youtube-dl | 52 | private-bin env,ffmpeg,python*,youtube-dl |
54 | private-cache | 53 | private-cache |
55 | private-dev | 54 | private-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'); |