From patchwork Mon Aug 20 21:36:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dmitry V. Levin" X-Patchwork-Id: 178931 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0720E2C0097 for ; Tue, 21 Aug 2012 07:36:34 +1000 (EST) Received: from localhost ([::1]:59891 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T3ZeC-0005Ij-BA for incoming@patchwork.ozlabs.org; Mon, 20 Aug 2012 17:36:32 -0400 Received: from eggs.gnu.org ([208.118.235.92]:41070) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T3Ze5-0005IT-6K for qemu-devel@nongnu.org; Mon, 20 Aug 2012 17:36:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T3Ze4-0008U0-1r for qemu-devel@nongnu.org; Mon, 20 Aug 2012 17:36:25 -0400 Received: from vint.altlinux.org ([194.107.17.35]:41419) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T3Ze3-0008Tg-Mv for qemu-devel@nongnu.org; Mon, 20 Aug 2012 17:36:23 -0400 Received: from wo.int.altlinux.org (wo.int.altlinux.org [192.168.1.4]) by vint.altlinux.org (Postfix) with ESMTP id 9982A3F80024; Mon, 20 Aug 2012 21:36:20 +0000 (UTC) Received: by wo.int.altlinux.org (Postfix, from userid 508) id 515193F4864A; Tue, 21 Aug 2012 01:36:18 +0400 (MSK) Date: Tue, 21 Aug 2012 01:36:17 +0400 From: "Dmitry V. Levin" To: qemu-devel@nongnu.org Message-ID: <20120820213617.GA22459@altlinux.org> References: <20120816212019.GB3688@altlinux.org> <20120818215629.GA27951@altlinux.org> Mime-Version: 1.0 Content-Disposition: inline In-Reply-To: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 194.107.17.35 Cc: Blue Swirl , Peter Maydell , Riku Voipio Subject: [Qemu-devel] [PATCH v3] linux-user: fix emulation of getdents X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 --- linux-user/syscall.c | 11 +++++------ linux-user/syscall_defs.h | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 41c869b..8a8aaca 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -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); diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h index 2cfda5a..f7271fa 100644 --- a/linux-user/syscall_defs.h +++ b/linux-user/syscall_defs.h @@ -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 {