Commit 99aea681 authored by Eric Biggers's avatar Eric Biggers Committed by Al Viro

vfs: Don't let __fdget_pos() get FMODE_PATH files

Commit bd2a31d5 ("get rid of fget_light()") introduced the
__fdget_pos() function, which returns the resulting file pointer and
fdput flags combined in an 'unsigned long'.  However, it also changed the
behavior to return files with FMODE_PATH set, which shouldn't happen
because read(), write(), lseek(), etc. aren't allowed on such files.
This commit restores the old behavior.

This regression actually had no effect on read() and write() since
FMODE_READ and FMODE_WRITE are not set on file descriptors opened with
O_PATH, but it did cause lseek() on a file descriptor opened with O_PATH
to fail with ESPIPE rather than EBADF.
Signed-off-by: default avatarEric Biggers <ebiggers3@gmail.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent d7a15f8d
...@@ -713,27 +713,16 @@ unsigned long __fdget_raw(unsigned int fd) ...@@ -713,27 +713,16 @@ unsigned long __fdget_raw(unsigned int fd)
unsigned long __fdget_pos(unsigned int fd) unsigned long __fdget_pos(unsigned int fd)
{ {
struct files_struct *files = current->files; unsigned long v = __fdget(fd);
struct file *file; struct file *file = (struct file *)(v & ~3);
unsigned long v;
if (atomic_read(&files->count) == 1) {
file = __fcheck_files(files, fd);
v = 0;
} else {
file = __fget(fd, 0);
v = FDPUT_FPUT;
}
if (!file)
return 0;
if (file->f_mode & FMODE_ATOMIC_POS) { if (file && (file->f_mode & FMODE_ATOMIC_POS)) {
if (file_count(file) > 1) { if (file_count(file) > 1) {
v |= FDPUT_POS_UNLOCK; v |= FDPUT_POS_UNLOCK;
mutex_lock(&file->f_pos_lock); mutex_lock(&file->f_pos_lock);
} }
} }
return v | (unsigned long)file; return v;
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment