0.9.42 testing - CentOS 60.9.42

2 files changed, 21 insertions, 2 deletions

diff --git a/src/firejail/appimage.c b/src/firejail/appimage.c
index eb90a39dd..05bd8a1d8 100644
--- a/src/firejail/appimage.c
+++ b/src/firejail/appimage.c
@@ -40,6 +40,7 @@ void appimage_set(const char *appimage_path) {
         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
         // check appimage_path
         if (access(appimage_path, R_OK) == -1) {
                 fprintf(stderr, "Error: cannot access AppImage file\n");
@@ -48,8 +49,10 @@ void appimage_set(const char *appimage_path) {
 
         // open as user to prevent race condition
         int ffd = open(appimage_path, O_RDONLY|O_CLOEXEC);
-        if (ffd == -1)
-                errExit("open");
+        if (ffd == -1) {
+                fprintf(stderr, "Error: /dev/loop-control interface is not supported by your kernel\n");
+                exit(1);
+        }
 
         EUID_ROOT();
 
@@ -109,6 +112,10 @@ void appimage_set(const char *appimage_path) {
                 errExit("asprintf");
         
         free(mode);
+#else
+        fprintf(stderr, "Error: /dev/loop-control interface is not supported by your kernel\n");
+        exit(1);
+#endif
 }
 
 void appimage_clear(void) {
diff --git a/src/firejail/checkcfg.c b/src/firejail/checkcfg.c
index 99266c575..34078492e 100644
--- a/src/firejail/checkcfg.c
+++ b/src/firejail/checkcfg.c
@@ -19,6 +19,7 @@
 */
 #include "firejail.h"
 #include <sys/stat.h>
+#include <linux/loop.h>
 
 #define MAX_READ 8192                             // line buffer for profile files
 
@@ -286,6 +287,17 @@ void print_compiletime_support(void) {
 #endif
                 );
 
+        printf("\t- AppImage support is %s\n",
+#ifdef LOOP_CTL_GET_FREE        // test for older kernels; this definition is found in /usr/include/linux/loop.h
+                "enabled"
+#else
+                "disabled"
+#endif
+                );
+
+
+
+
 
         printf("\t- bind support is %s\n",
 #ifdef HAVE_BIND