From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754725Ab1IQMae (ORCPT ); Sat, 17 Sep 2011 08:30:34 -0400 Received: from www17.your-server.de ([213.133.104.17]:59668 "EHLO www17.your-server.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752503Ab1IQMac (ORCPT ); Sat, 17 Sep 2011 08:30:32 -0400 Subject: [PATCH] sys_poll: Fix negative timeout values for x86 userland on x86_64 kernels From: Thomas Meyer To: Andi Kleen , Linux Kernel Mailing List , Eric Dumazet Date: Sat, 17 Sep 2011 14:30:25 +0200 Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.0.3 (3.0.3-1.fc15) Content-Transfer-Encoding: 7bit Message-ID: <1316262630.5814.9.camel@localhost.localdomain> Mime-Version: 1.0 X-Authenticated-Sender: thomas@m3y3r.de Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org sizeof(int/long) differs on x86 and x86_64, so provide a compat_sys_poll(). 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(-) 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..f176fda 100644 --- a/fs/compat.c +++ b/fs/compat.c @@ -1621,6 +1621,12 @@ asmlinkage long compat_sys_pselect6(int n, compat_ulong_t __user *inp, sigsetsize); } +asmlinkage long compat_sys_poll(struct pollfd __user *ufds, unsigned int nfds, + int timeout) +{ + return sys_poll(ufds, nfds, timeout); +} + asmlinkage long compat_sys_ppoll(struct pollfd __user *ufds, unsigned int nfds, struct compat_timespec __user *tsp, const compat_sigset_t __user *sigmask, compat_size_t sigsetsize) 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