From 5076a73928cd9917fe78515e3dd91d957dd20063 Mon Sep 17 00:00:00 2001
From: Peter Millerchip <pete@millerchipsoftware.com>
Date: Sat, 15 Aug 2015 21:40:59 +0100
Subject: Call realpath to resolve symlinks correctly in disable_file

---
 src/firejail/fs.c | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/firejail/fs.c b/src/firejail/fs.c
index 1fc1c0942..5b8093885 100644
--- a/src/firejail/fs.c
+++ b/src/firejail/fs.c
@@ -152,27 +152,24 @@ static char *create_empty_file(void) {
 	return RO_FILE;
 }
 
-static void disable_file(OPERATION op, const char *fname, const char *emptydir, const char *emptyfile) {
-	assert(fname);
+static void disable_file(OPERATION op, const char *filename, const char *emptydir, const char *emptyfile) {
+	assert(filename);
 	assert(emptydir);
 	assert(emptyfile);
 	assert(op <OPERATION_MAX);
-
-	// if the file is a link, follow the link
-	char *lnk = NULL;
-	if (is_link(fname)) {
-		lnk = get_link(fname);
-		if (lnk)
-			fname = lnk;
-		else
-			fprintf(stderr, "Warning: cannot follow link %s, skipping...\n", fname);
+	
+	// Resolve all symlinks
+	char* fname = realpath(filename, NULL);
+	if (fname == NULL) {
+		printf("Warning: %s is an invalid file, skipping...\n", filename);
+		return;
 	}
 	
 	// if the file is not present, do nothing
 	struct stat s;
 	if (stat(fname, &s) == -1) {
-		if (lnk)
-			free(lnk);
+		printf("Warning: %s does not exist, skipping...\n", fname);
+		free(fname);
 		return;
 	}
 
@@ -211,8 +208,7 @@ static void disable_file(OPERATION op, const char *fname, const char *emptydir,
 	else
 		assert(0);
 
-	if (lnk)
-		free(lnk);
+	free(fname);
 }
 
 static void globbing(OPERATION op, const char *fname, const char *emptydir, const char *emptyfile) {
-- 
cgit v1.2.3-54-g00ecf