btrfs-progs: Fix pointer math in __ino_to_path_fd
authorMark Fasheh <mfasheh@suse.de>
Thu, 14 Feb 2013 18:29:50 +0000 (10:29 -0800)
committerDavid Sterba <dsterba@suse.cz>
Tue, 19 Feb 2013 10:15:30 +0000 (11:15 +0100)
We are casting an array of u64 values into a char ** array so
when we dereference this array (as a char **) on a 32 bit system
we're then re-casting that back to a 32 bit value. This causes
problems when we try to print those strings.

Signed-off-by: Mark Fasheh <mfasheh@suse.de>
cmds-inspect.c

index ff6d00f..7761759 100644 (file)
@@ -63,12 +63,15 @@ static int __ino_to_path_fd(u64 inum, int fd, int verbose, const char *prepend)
                        fspath->elem_cnt, fspath->elem_missed);
 
        for (i = 0; i < fspath->elem_cnt; ++i) {
-               char **str = (char **)fspath->val;
-               str[i] += (unsigned long)fspath->val;
+               u64 ptr;
+               char *str;
+               ptr = (u64)(unsigned long)fspath->val;
+               ptr += fspath->val[i];
+               str = (char *)(unsigned long)ptr;
                if (prepend)
-                       printf("%s/%s\n", prepend, str[i]);
+                       printf("%s/%s\n", prepend, str);
                else
-                       printf("%s\n", str[i]);
+                       printf("%s\n", str);
        }
 
 out: