a453b81de2
Update to v1.2.0-rc1 OBS-URL: https://build.opensuse.org/request/show/131959 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=104
62 lines
2.5 KiB
Diff
62 lines
2.5 KiB
Diff
From d97740f5cc4e23c5b3fb328eddd2fe409c1dc986 Mon Sep 17 00:00:00 2001
|
|
From: "Dmitry V. Levin" <ldv@altlinux.org>
|
|
Date: Mon, 20 Aug 2012 12:13:12 +0000
|
|
Subject: [PATCH] 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).
|
|
|
|
Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
|
|
Signed-off-by: Alexander Graf <agraf@suse.de>
|
|
---
|
|
linux-user/syscall.c | 11 +++++------
|
|
linux-user/syscall_defs.h | 8 ++++----
|
|
2 files changed, 9 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
|
|
index b4ab1d9..fc27851 100644
|
|
--- a/linux-user/syscall.c
|
|
+++ b/linux-user/syscall.c
|
|
@@ -7161,15 +7161,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);
|
|
diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
|
|
index 349229d..d618414 100644
|
|
--- a/linux-user/syscall_defs.h
|
|
+++ b/linux-user/syscall_defs.h
|
|
@@ -255,10 +255,10 @@ struct kernel_statfs {
|
|
};
|
|
|
|
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! */
|
|
+ abi_long d_ino;
|
|
+ abi_long d_off;
|
|
+ unsigned short d_reclen;
|
|
+ char d_name[];
|
|
};
|
|
|
|
struct target_dirent64 {
|