0.9.48 testing

3 files changed, 4 insertions, 3 deletions

diff --git a/src/firejail/appimage.c b/src/firejail/appimage.c
index 976750f8f..0f7ab40ff 100644
--- a/src/firejail/appimage.c
+++ b/src/firejail/appimage.c
@@ -31,17 +31,19 @@
 static char *devloop = NULL;    // device file
 static char *mntdir = NULL;     // mount point in /tmp directory
 
+#ifdef LOOP_CTL_GET_FREE        // test for older kernels; this definition is found in /usr/include/linux/loop.h
 static void err_loop(void) {
         fprintf(stderr, "Error: cannot configure loopback device\n");
         exit(1);
 }
+#endif
 
 void appimage_set(const char *appimage) {
         assert(appimage);
         assert(devloop == NULL);        // don't call this twice!
         EUID_ASSERT();
 
-#ifdef LOOP_CTL_GET_FREE        // test for older kernels; this definition is found in /usr/include/linux/loop.h
+#ifdef LOOP_CTL_GET_FREE
         // check appimage file
         invalid_filename(appimage);
         if (access(appimage, R_OK) == -1) {
diff --git a/src/firejail/fs_dev.c b/src/firejail/fs_dev.c
index 8ab176961..fdaa0b355 100644
--- a/src/firejail/fs_dev.c
+++ b/src/firejail/fs_dev.c
@@ -52,7 +52,7 @@ static DevEntry dev[] = {
         {"/dev/nvidia7", RUN_DEV_DIR "/nvidia7", 0, 1, 0},
         {"/dev/nvidia8", RUN_DEV_DIR "/nvidia8", 0, 1, 0},
         {"/dev/nvidia9", RUN_DEV_DIR "/nvidia9", 0, 1, 0},
-        {"/dev/nvidiactl", RUN_DEV_DIR "/nvidiactl", 0, 1},
+        {"/dev/nvidiactl", RUN_DEV_DIR "/nvidiactl", 0, 1, 0},
         {"/dev/nvidia-modeset", RUN_DEV_DIR "/nvidia-modeset", 0, 1, 0},
         {"/dev/nvidia-uvm", RUN_DEV_DIR "/nvidia-uvm", 0, 1, 0},
         {"/dev/video0", RUN_DEV_DIR "/video0", 0, 0, 1}, // video camera devices
diff --git a/src/firejail/sandbox.c b/src/firejail/sandbox.c
index 7489e7b6d..4ee05d070 100644
--- a/src/firejail/sandbox.c
+++ b/src/firejail/sandbox.c
@@ -989,7 +989,6 @@ int sandbox(void* sandbox_arg) {
         if (app_pid == 0) {
 #ifdef HAVE_APPARMOR
                 if (arg_apparmor) {
-                        int done = 0;
                         errno = 0;
                         if (aa_change_onexec("firejail-default")) {
                                 fwarning("Cannot confine the application using AppArmor.\n"