Use a temporary 32-bit variable in readlink_by_handle to avoid

updating the wrong half of a size_t pointer. This could happen
on 64-bit, big endian systems.

diff --git a/VERSION b/VERSION
index c48b852c640c29fa81cbffeafc82118210a0c80d..106aa2259cc5e5726c8ed26ff39105d491f49b88 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -3,5 +3,5 @@
 #
 PKG_MAJOR=2
 PKG_MINOR=6
-PKG_REVISION=32
+PKG_REVISION=33
 PKG_BUILD=1

diff --git a/doc/CHANGES b/doc/CHANGES
index 90b863b77b2d36cecb4f3e17e1bc4064a301d83e..ad336c33cb642327241fcda2b9603c2986d19018 100644 (file)
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,3 +1,6 @@
+xfsprogs-2.6.33 (13 June 2005)
+       - Another libhandle fix on 64bit, Big Endian systems.
+
 xfsprogs-2.6.32 (08 June 2005)
        - Minor endian cleanups in some tools.
        - Fix a couple of xfs_quota double-reporting issues when

diff --git a/libhandle/handle.c b/libhandle/handle.c
index 988f36dab2ccb5b47fc2d86048d8de166c8e5173..f19d8825bf7738b51a2d637f7c8c701b33e8113a 100644 (file)
--- a/libhandle/handle.c
+++ b/libhandle/handle.c
@@ -284,6 +284,7 @@ readlink_by_handle(
        size_t          bufsiz)
 {
        int             fd;
+       __u32           buflen = (__u32)bufsiz;
        char            *path;
        xfs_fsop_handlereq_t hreq;
 
@@ -296,7 +297,7 @@ readlink_by_handle(
        hreq.ihandle  = hanp;
        hreq.ihandlen = hlen;
        hreq.ohandle  = buf;
-       hreq.ohandlen = (__u32 *)&bufsiz;
+       hreq.ohandlen = &buflen;
 
        return xfsctl(path, fd, XFS_IOC_READLINK_BY_HANDLE, &hreq);
 }