aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar smitsohu <smitsohu@gmail.com>2021-06-20 22:50:14 +0200
committerLibravatar smitsohu <smitsohu@gmail.com>2021-06-20 22:58:19 +0200
commit9c071c863b30de5a7a1180a0ef0860c04887c96e (patch)
tree4aaaff0bc6490291a662765c109d58e85f8fbd2e
parentMerge branch 'master' of ssh://github.com/netblue30/firejail (diff)
downloadfirejail-9c071c863b30de5a7a1180a0ef0860c04887c96e.tar.gz
firejail-9c071c863b30de5a7a1180a0ef0860c04887c96e.tar.zst
firejail-9c071c863b30de5a7a1180a0ef0860c04887c96e.zip
cleanup
-rw-r--r--src/firejail/dbus.c4
-rw-r--r--src/firejail/dhcp.c3
2 files changed, 2 insertions, 5 deletions
diff --git a/src/firejail/dbus.c b/src/firejail/dbus.c
index bfa28fcba..9a4cb2e6b 100644
--- a/src/firejail/dbus.c
+++ b/src/firejail/dbus.c
@@ -470,7 +470,7 @@ void dbus_apply_policy(void) {
470 create_empty_dir_as_root(RUN_DBUS_DIR, 0755); 470 create_empty_dir_as_root(RUN_DBUS_DIR, 0755);
471 471
472 if (arg_dbus_user != DBUS_POLICY_ALLOW) { 472 if (arg_dbus_user != DBUS_POLICY_ALLOW) {
473 create_empty_file_as_root(RUN_DBUS_USER_SOCKET, 0700); 473 create_empty_file_as_root(RUN_DBUS_USER_SOCKET, 0600);
474 474
475 if (arg_dbus_user == DBUS_POLICY_FILTER) { 475 if (arg_dbus_user == DBUS_POLICY_FILTER) {
476 assert(dbus_user_proxy_socket != NULL); 476 assert(dbus_user_proxy_socket != NULL);
@@ -509,7 +509,7 @@ void dbus_apply_policy(void) {
509 } 509 }
510 510
511 if (arg_dbus_system != DBUS_POLICY_ALLOW) { 511 if (arg_dbus_system != DBUS_POLICY_ALLOW) {
512 create_empty_file_as_root(RUN_DBUS_SYSTEM_SOCKET, 0700); 512 create_empty_file_as_root(RUN_DBUS_SYSTEM_SOCKET, 0600);
513 513
514 if (arg_dbus_system == DBUS_POLICY_FILTER) { 514 if (arg_dbus_system == DBUS_POLICY_FILTER) {
515 assert(dbus_system_proxy_socket != NULL); 515 assert(dbus_system_proxy_socket != NULL);
diff --git a/src/firejail/dhcp.c b/src/firejail/dhcp.c
index 47dd39ac0..ec482e2ea 100644
--- a/src/firejail/dhcp.c
+++ b/src/firejail/dhcp.c
@@ -160,9 +160,6 @@ void dhcp_start(void) {
160 exit(1); 160 exit(1);
161 } 161 }
162 162
163 sbox_run(SBOX_ROOT| SBOX_SECCOMP, 4, PATH_FCOPY, "--follow-link", dhclient_path, RUN_MNT_DIR);
164 dhclient_path = RUN_MNT_DIR "/dhclient";
165
166 EUID_ROOT(); 163 EUID_ROOT();
167 if (mkdir(RUN_DHCLIENT_DIR, 0700)) 164 if (mkdir(RUN_DHCLIENT_DIR, 0700))
168 errExit("mkdir"); 165 errExit("mkdir");