diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2013-09-22 22:27:52 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-10-25 05:34:54 +0200 |
| commit | 72c2d53192004845cbc19cd8a30b3212a9288140 (patch) | |
| tree | 31fcd924438f03d5aa09d13ffd813fb153da37c3 /fs/exec.c | |
| parent | rtl8188eu: remove dead code (diff) | |
| download | linux-72c2d53192004845cbc19cd8a30b3212a9288140.tar.xz linux-72c2d53192004845cbc19cd8a30b3212a9288140.zip | |
file->f_op is never NULL...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/exec.c')
| -rw-r--r-- | fs/exec.c | 35 |
1 files changed, 15 insertions, 20 deletions
diff --git a/fs/exec.c b/fs/exec.c index 8875dd10ae7a..351440fbf1ee 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -106,6 +106,7 @@ static inline void put_binfmt(struct linux_binfmt * fmt) */ SYSCALL_DEFINE1(uselib, const char __user *, library) { + struct linux_binfmt *fmt; struct file *file; struct filename *tmp = getname(library); int error = PTR_ERR(tmp); @@ -136,24 +137,21 @@ SYSCALL_DEFINE1(uselib, const char __user *, library) fsnotify_open(file); error = -ENOEXEC; - if(file->f_op) { - struct linux_binfmt * fmt; - read_lock(&binfmt_lock); - list_for_each_entry(fmt, &formats, lh) { - if (!fmt->load_shlib) - continue; - if (!try_module_get(fmt->module)) - continue; - read_unlock(&binfmt_lock); - error = fmt->load_shlib(file); - read_lock(&binfmt_lock); - put_binfmt(fmt); - if (error != -ENOEXEC) - break; - } + read_lock(&binfmt_lock); + list_for_each_entry(fmt, &formats, lh) { + if (!fmt->load_shlib) + continue; + if (!try_module_get(fmt->module)) + continue; read_unlock(&binfmt_lock); + error = fmt->load_shlib(file); + read_lock(&binfmt_lock); + put_binfmt(fmt); + if (error != -ENOEXEC) + break; } + read_unlock(&binfmt_lock); exit: fput(file); out: @@ -1277,13 +1275,10 @@ static int check_unsafe_exec(struct linux_binprm *bprm) */ int prepare_binprm(struct linux_binprm *bprm) { - umode_t mode; - struct inode * inode = file_inode(bprm->file); + struct inode *inode = file_inode(bprm->file); + umode_t mode = inode->i_mode; int retval; - mode = inode->i_mode; - if (bprm->file->f_op == NULL) - return -EACCES; /* clear any previous set[ug]id data from a previous binary */ bprm->cred->euid = current_euid(); |