From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754963Ab1IRIFl (ORCPT ); Sun, 18 Sep 2011 04:05:41 -0400 Received: from www17.your-server.de ([213.133.104.17]:43418 "EHLO www17.your-server.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754076Ab1IRIFL (ORCPT ); Sun, 18 Sep 2011 04:05:11 -0400 Subject: [PATCH 1/3] sys_poll: Fix negative timeout values for x86 userland on x86_64 kernels v2 From: Thomas Meyer To: Linux Kernel Mailing List , linux-arch@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Date: Sun, 18 Sep 2011 10:04:02 +0200 Message-ID: <1316333042.5814.23.camel@localhost.localdomain> Mime-Version: 1.0 X-Mailer: Evolution 3.0.3 (3.0.3-1.fc15) Content-Transfer-Encoding: 7bit X-Authenticated-Sender: thomas@m3y3r.de Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org size of int and long differs on x86 and x86_64. the ia32 emulation calls directly into the sys_poll function. when the timeout is set to -1 the test for sign will fail in sys_poll as the 64bit register is tested. the timeout timer will be set to 0xffffffff milliseconds, but the timer shouldn't get set at all in this situation. Signed-off-by: Thomas Meyer --- arch/x86/ia32/ia32entry.S | 2 +- fs/compat.c | 6 ++++++ include/linux/compat.h | 2 ++ 3 files changed, 9 insertions(+), 1 deletions(-) move sys_poll() out of the #ifdef diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S index 54edb207..30f4116 100644 --- a/arch/x86/ia32/ia32entry.S +++ b/arch/x86/ia32/ia32entry.S @@ -671,7 +671,7 @@ ia32_sys_call_table: .quad sys_getresuid16 /* 165 */ .quad sys32_vm86_warning /* vm86 */ .quad quiet_ni_syscall /* query_module */ - .quad sys_poll + .quad compat_sys_poll .quad quiet_ni_syscall /* old nfsservctl */ .quad sys_setresgid16 /* 170 */ .quad sys_getresgid16 diff --git a/fs/compat.c b/fs/compat.c index 58b1da4..232675e 100644 --- a/fs/compat.c +++ b/fs/compat.c @@ -1550,6 +1550,12 @@ asmlinkage long compat_sys_old_select(struct compat_sel_arg_struct __user *arg) compat_ptr(a.exp), compat_ptr(a.tvp)); } +asmlinkage long compat_sys_poll(struct pollfd __user *ufds, unsigned int nfds, + int timeout) +{ + return sys_poll(ufds, nfds, timeout); +} + #ifdef HAVE_SET_RESTORE_SIGMASK static long do_compat_pselect(int n, compat_ulong_t __user *inp, compat_ulong_t __user *outp, compat_ulong_t __user *exp, diff --git a/include/linux/compat.h b/include/linux/compat.h index c6e7523..3bfb30a 100644 --- a/include/linux/compat.h +++ b/include/linux/compat.h @@ -433,6 +433,8 @@ asmlinkage long compat_sys_pselect6(int n, compat_ulong_t __user *inp, compat_ulong_t __user *exp, struct compat_timespec __user *tsp, void __user *sig); +asmlinkage long compat_sys_poll(struct pollfd __user *ufds, unsigned int nfds, + int timeout); asmlinkage long compat_sys_ppoll(struct pollfd __user *ufds, unsigned int nfds, struct compat_timespec __user *tsp, -- 1.7.6