rpm/qemu
SHA256
1
0
Fork 0
forked from pool/qemu
Code Pull Requests Activity

- linux-user: fix lseek with SEEK_END

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=125
This commit is contained in:
Alexander Graf 2012-12-13 13:31:35 +00:00 committed by Git OBS Bridge
parent 91a548c8b1
commit 85f888f7b9
3 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
0039-linux-user-lseek-explicitly-cast-en.patch Normal file
View File

@ -0,0 +1,38 @@
From 9b90b7e01f2f4d474e68a43b5f1b2e821dfa8619 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Thu, 13 Dec 2012 14:29:22 +0100
Subject: [PATCH] linux-user: lseek: explicitly cast end offsets to signed
When doing lseek, SEEK_END indicates that the offset is a signed variable
that is usually negative, while and other SEEK indicates that it's unsigned.
When converting from 32bit to 64bit parameters, we need to take this into
account and enable SEEK_END to be negative, while other SEEKs usually indicate
absolute position which we need to maintain as unsigned.
Signed-off-by: Alexander Graf <agraf@suse.de>
---
linux-user/syscall.c | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index a694181..a038cbe 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -5597,9 +5597,14 @@ abi_long do_syscall(void *cpu_env, int num, abi_ulong arg1,
case TARGET_NR_oldstat:
goto unimplemented;
#endif
- case TARGET_NR_lseek:
- ret = get_errno(lseek(arg1, arg2, arg3));
+ case TARGET_NR_lseek: {
+ off_t off = arg2;
+ if (arg3 == SEEK_END) {
+ off = (abi_long)arg2;
+ }
+ ret = get_errno(lseek(arg1, off, arg3));
break;
+ }
#if defined(TARGET_NR_getxpid) && defined(TARGET_ALPHA)
/* Alpha specific */
case TARGET_NR_getxpid:

5
qemu.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Dec 13 13:30:57 UTC 2012 - agraf@suse.com
- linux-user: fix lseek with SEEK_END
-------------------------------------------------------------------
Thu Dec 13 10:47:52 UTC 2012 - agraf@suse.com

2
qemu.spec
View File

@ -62,6 +62,7 @@ Patch0035: 0035-Legacy-Patch-kvm-qemu-preXX-dictzip.patch
Patch0036: 0036-Legacy-Patch-kvm-qemu-preXX-report-.patch
Patch0037: 0037-console-add-question-mark-escape-op.patch
Patch0038: 0038-Make-char-muxer-more-robust-wrt-sma.patch
Patch0039: 0039-linux-user-lseek-explicitly-cast-en.patch
# this is to make lint happy
Source300: rpmlintrc
Source302: bridge.conf
@ -218,6 +219,7 @@ run cross-architecture builds.
%patch0036 -p1
%patch0037 -p1
%patch0038 -p1
%patch0039 -p1
%build
# build QEMU