>
>
> Index: linux-2.6/fs/exec.c
> ===================================================================
> --- linux-2.6.orig/fs/exec.c 2007-09-16 20:29:01.000000000 +0200
> +++ linux-2.6/fs/exec.c 2007-09-16 20:29:56.000000000 +0200
> @@ -669,41 +669,55 @@ EXPORT_SYMBOL(setup_arg_pages);
>
> #endif /* CONFIG_MMU */
>
> +/**
> + * open_exec - open file for execution
> + * @name: filename to open
> + *
> + * Open the file pointed to by @filename in the current namespace
> + * for execution. Error out if the file is not a regular file or
> + * this mount does not allow executing files on it.
> + */
> struct file *open_exec(const char *name)
> {
> struct nameidata nd;
> - int err;
> struct file *file;
> + int err;
>
> - err = path_lookup_open(AT_FDCWD, name, LOOKUP_FOLLOW, &nd, FMODE_READ|FMODE_EXEC);
> - file = ERR_PTR(err);
> + err = path_lookup_open(AT_FDCWD, name, LOOKUP_FOLLOW, &nd,
> + FMODE_READ|FMODE_EXEC);
> + if (unlikely(err))
> + goto out;
>
> - if (!err) {
> - struct inode *inode = nd.dentry->d_inode;
> - file = ERR_PTR(-EACCES);
> - if (!(nd.mnt->mnt_flags & MNT_NOEXEC) &&
> - S_ISREG(inode->i_mode)) {
> - int err = vfs_permission(&nd, MAY_EXEC);
> - file = ERR_PTR(err);
> - if (!err) {
> - file = nameidata_to_filp(&nd, O_RDONLY);
> - if (!IS_ERR(file)) {
> - err = deny_write_access(file);
> - if (err) {
> - fput(file);
> - file = ERR_PTR(err);
> - }
> - }
> -out:
> - return file;
> - }
> - }
> - release_open_intent(&nd);
> - path_release(&nd);
> + err = -EACCES;
> + if (unlikely(nd.mnt->mnt_flags & MNT_NOEXEC))
> + goto out_path_release;
> + if (unlikely(!S_ISREG(nd.dentry->d_inode->i_mode)))
> + goto out_path_release;
> +
> + err = vfs_permission(&nd, MAY_EXEC);
> + if (unlikely(err))
> + goto out_path_release;
> +
> + file = nameidata_to_filp(&nd, O_RDONLY);
> + if (unlikely(IS_ERR(file))) {
> + err = PTR_ERR(file);
> + goto out;
> + }
> +
> + err = deny_write_access(file);
> + if (unlikely(err)) {
> + fput(file);
> + goto out;
> }
> - goto out;
> -}
>
> + return file;
> +
> + out_path_release:
> + release_open_intent(&nd);
> + path_release(&nd);
> + out:
> + return ERR_PTR(err);
> +}
> EXPORT_SYMBOL(open_exec);
>
> int kernel_read(struct file *file, unsigned long offset,
> -
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to
majordomo@vger.kernel.org
> More majordomo info at
http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at
http://www.tux.org/lkml/
>
