Skip to content

Commit

Permalink
merges, fix for #3662 etc.
Browse files Browse the repository at this point in the history
  • Loading branch information
netblue30 committed Oct 13, 2020
1 parent d79cbe2 commit 8efb4d3
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 6 deletions.
2 changes: 2 additions & 0 deletions README
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,8 @@ Danil Semelenov (https://github.com/sgtpep)
Dara Adib (https://github.com/daradib)
- ssh profile fix
- evince profile fix
Dario Pellegrini (https://github.com/dpellegr)
- allowing links in netns
David Thole (https://github.com/TheDarkTrumpet)
- added profile for teams-for-linux
Davide Beatrici (https://github.com/davidebeatrici)
Expand Down
8 changes: 4 additions & 4 deletions etc/profile-a-l/fdns.profile
Original file line number Diff line number Diff line change
Expand Up @@ -29,20 +29,20 @@ no3d
nodvd
nogroups
nonewprivs
# noroot
noroot
nosound
notv
nou2f
novideo
protocol unix,inet,inet6
protocol unix,inet,inet6,netlink
#seccomp
#shell none

disable-mnt
private
private-bin bash,fdns,sh
# private-cache
private-dev
private-cache
#private-dev
private-etc ca-certificates,crypto-policies,fdns,ld.so.cache,ld.so.preload,localtime,nsswitch.conf,passwd,pki,ssl
# private-lib
private-tmp
Expand Down
14 changes: 12 additions & 2 deletions src/firejail/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -3080,17 +3080,27 @@ int main(int argc, char **argv, char **envp) {
// end of signal-safe code
//*****************************

#if 0
// at this point the sandbox was closed and we are on our way out
// it would make sense to move this before waitpid above to free some memory
// crash for now as of issue #3662 from dhcp code
// free globals
if (cfg.profile) {
ProfileEntry *prf = cfg.profile;
while (prf != NULL) {
ProfileEntry *next = prf->next;
free(prf->data);
free(prf->link);
printf("data #%s#\n", prf->data);
if (prf->data)
free(prf->data);
printf("link #%s#\n", prf->link);
if (prf->link)
free(prf->link);
free(prf);
prf = next;
}
}
#endif


if (WIFEXITED(status)){
myexit(WEXITSTATUS(status));
Expand Down

0 comments on commit 8efb4d3

Please sign in to comment.