From cac56c4878d27ef636188093ba133729519cc22e Mon Sep 17 00:00:00 2001
From: Julien Isorce <j.isorce@samsung.com>
Date: Tue, 10 May 2016 13:18:06 +0100
Subject: binfmt: translate symbolic links correctly with realpath

Change-Id: Ic0eeac9de40a8e1082c83b442829ac28f68bff04
Signed-off-by: Julien Isorce <j.isorce@samsung.com>
Signed-off-by: Yury Usishchev <y.usishchev@samsung.com>
---
 linux-user/binfmt.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/linux-user/binfmt.c b/linux-user/binfmt.c
index 2a9009621..e9e9b6583 100644
--- a/linux-user/binfmt.c
+++ b/linux-user/binfmt.c
@@ -4,6 +4,7 @@
 #include <libgen.h>
 #include <string.h>
 #include <stdlib.h>
+#include <limits.h>
 
 
 int main(int argc, char **argv, char **envp)
@@ -29,10 +30,20 @@ int main(int argc, char **argv, char **envp)
     /* Now argv[0] is the real qemu binary name */
 
     {
-        char *hostbin;
+        int len;
         int r;
+        char buf[PATH_MAX];
+        char *hostbin;
+        char *path;
+
+        /* Follow symbolic link if any. */
+        path = realpath(argv[1], buf);
+        if (path == NULL) {
+	    /* Error occured, falling back to original argument */
+            path = argv[1];
+        }
 
-        r = asprintf(&hostbin, "/emul/%s", argv[1]);
+        r = asprintf(&hostbin, "/emul/%s", path);
         if (!access(hostbin, X_OK) && (r > 0)) {
             /*
              * We found a host binary replacement for the non-host binary. Let's
-- 
cgit v1.2.3