daemon: Fix hexdump to work on absolute symbolic links (RHBZ#579608).

2 files changed, 15 insertions, 8 deletions

diff --git a/daemon/hexdump.c b/daemon/hexdump.c
index 1b33eeb3..202f856c 100644
--- a/daemon/hexdump.c
+++ b/daemon/hexdump.c
@@ -21,6 +21,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
+#include <fcntl.h>
 
 #include "daemon.h"
 #include "actions.h"
@@ -28,18 +30,20 @@
 char *
 do_hexdump (const char *path)
 {
-  char *buf;
-  int r;
+  int fd, flags, r;
   char *out, *err;
 
-  buf = sysroot_path (path);
-  if (!buf) {
-    reply_with_perror ("malloc");
+  CHROOT_IN;
+  fd = open (path, O_RDONLY);
+  CHROOT_OUT;
+
+  if (fd == -1) {
+    reply_with_perror ("%s", path);
     return NULL;
   }
 
-  r = command (&out, &err, "hexdump", "-C", buf, NULL);
-  free (buf);
+  flags = COMMAND_FLAG_CHROOT_COPY_FILE_TO_STDIN | fd;
+  r = commandf (&out, &err, flags, "hexdump", "-C", NULL);
   if (r == -1) {
     reply_with_error ("%s: %s", path, err);
     free (err);
diff --git a/src/generator.ml b/src/generator.ml
index cbed94b7..5b479e78 100755
--- a/src/generator.ml
+++ b/src/generator.ml
@@ -2474,7 +2474,10 @@ The returned strings are transcoded to UTF-8.");
      * commands to segfault.
      *)
     InitISOFS, Always, TestRun (
-      [["hexdump"; "/100krandom"]])],
+      [["hexdump"; "/100krandom"]]);
+    (* Test for RHBZ#579608, absolute symbolic links. *)
+    InitISOFS, Always, TestRun (
+      [["hexdump"; "/abssymlink"]])],
    "dump a file in hexadecimal",
    "\
 This runs C<hexdump -C> on the given C<path>.  The result is