lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dup2: Fix return value with oldfd == newfd and invalid fd

Browse Source 
The return value of dup2 when oldfd == newfd and the fd isn't valid is
not getting properly sign extended.  We end up with 4294967287 instead
of -EBADF.

I've reproduced this on SLE11 (2.6.27.21), openSUSE Factory
(2.6.29-rc5), and Ubuntu 9.04 (2.6.28).

This patch uses a signed int for the error value so it is properly
extended.

Commit 6c5d0512a0 introduced this
regression.

Reported-by: Jiri Dluhos <jdluhos@novell.com>
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jeff Mahoney
2009-05-11 14:25:34 -04:00
committed by Linus Torvalds
parent fd18de50b9
commit 2b79bc4f7e
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fs/fcntl.c
View File

@@ -117,11 +117,13 @@ SYSCALL_DEFINE2(dup2, unsigned int, oldfd, unsigned int, newfd)
{ {
if (unlikely(newfd == oldfd)) { /* corner case */ if (unlikely(newfd == oldfd)) { /* corner case */
struct files_struct *files = current->files; struct files_struct *files = current->files;
int retval = oldfd;
rcu_read_lock(); rcu_read_lock();
if (!fcheck_files(files, oldfd)) if (!fcheck_files(files, oldfd))
oldfd = -EBADF; retval = -EBADF;
rcu_read_unlock(); rcu_read_unlock();
return oldfd; return retval;
} }
return sys_dup3(oldfd, newfd, 0); return sys_dup3(oldfd, newfd, 0);
} }