Commit 333858b7 authored by Dmitry V. Levin's avatar Dmitry V. Levin Committed by Riku Voipio
Browse files

linux-user: fix emulation of getdents 



In case when TARGET_ABI_BITS == 32 && HOST_LONG_BITS == 64, the last
byte of the target dirent structure (aka d_type byte) was never copied
from the host dirent structure, thus breaking everything that relies
on valid d_type value, e.g. glob(3).

Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarDmitry V. Levin <ldv@altlinux.org>
Signed-off-by: default avatarRiku Voipio <riku.voipio@linaro.org>
parent 42644cee

linux-user/syscall.c

+5 −6
Original line number Diff line number Diff line
@@ -7025,15 +7025,14 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, 
		tde = target_dirp;

                while (len > 0) {

                    reclen = de->d_reclen;

		    treclen = reclen - (2 * (sizeof(long) - sizeof(abi_long)));

                    tnamelen = reclen - offsetof(struct linux_dirent, d_name);

                    assert(tnamelen >= 0);

                    treclen = tnamelen + offsetof(struct target_dirent, d_name);

                    assert(count1 + treclen <= count);

                    tde->d_reclen = tswap16(treclen);

                    tde->d_ino = tswapal(de->d_ino);

                    tde->d_off = tswapal(de->d_off);

		    tnamelen = treclen - (2 * sizeof(abi_long) + 2);

		    if (tnamelen > 256)

                        tnamelen = 256;

                    /* XXX: may not be correct */

                    pstrcpy(tde->d_name, tnamelen, de->d_name);

                    memcpy(tde->d_name, de->d_name, tnamelen);

                    de = (struct linux_dirent *)((char *)de + reclen);

                    len -= reclen;

                    tde = (struct target_dirent *)((char *)tde + treclen);

linux-user/syscall_defs.h

+4 −4
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ struct target_dirent { 
        abi_long        d_ino;

        abi_long        d_off;

        unsigned short  d_reclen;

	char		d_name[256]; /* We must not include limits.h! */

        char            d_name[];

};



struct target_dirent64 {