Merge ../linux-2.6

1 files changed, 10 insertions, 6 deletions

diff --git a/fs/exec.c b/fs/exec.c
index cd6c574557dc..c466fec5de20 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -135,7 +135,7 @@ asmlinkage long sys_uselib(const char __user * library)
         if (!S_ISREG(nd.dentry->d_inode->i_mode))
                 goto exit;
 
-        error = permission(nd.dentry->d_inode, MAY_READ | MAY_EXEC, &nd);
+        error = vfs_permission(&nd, MAY_READ | MAY_EXEC);
         if (error)
                 goto exit;
 
@@ -495,7 +495,7 @@ struct file *open_exec(const char *name)
                 file = ERR_PTR(-EACCES);
                 if (!(nd.mnt->mnt_flags & MNT_NOEXEC) &&
                     S_ISREG(inode->i_mode)) {
-                        int err = permission(inode, MAY_EXEC, &nd);
+                        int err = vfs_permission(&nd, MAY_EXEC);
                         if (!err && !(inode->i_mode & 0111))
                                 err = -EACCES;
                         file = ERR_PTR(err);
@@ -590,6 +590,7 @@ static inline int de_thread(struct task_struct *tsk)
         struct signal_struct *sig = tsk->signal;
         struct sighand_struct *newsighand, *oldsighand = tsk->sighand;
         spinlock_t *lock = &oldsighand->siglock;
+        struct task_struct *leader = NULL;
         int count;
 
         /*
@@ -665,7 +666,7 @@ static inline int de_thread(struct task_struct *tsk)
          * and to assume its PID:
          */
         if (!thread_group_leader(current)) {
-                struct task_struct *leader = current->group_leader, *parent;
+                struct task_struct *parent;
                 struct dentry *proc_dentry1, *proc_dentry2;
                 unsigned long exit_state, ptrace;
 
@@ -674,6 +675,7 @@ static inline int de_thread(struct task_struct *tsk)
                  * It should already be zombie at this point, most
                  * of the time.
                  */
+                leader = current->group_leader;
                 while (leader->exit_state != EXIT_ZOMBIE)
                         yield();
 
@@ -733,7 +735,6 @@ static inline int de_thread(struct task_struct *tsk)
                 proc_pid_flush(proc_dentry2);
 
                 BUG_ON(exit_state != EXIT_ZOMBIE);
-                release_task(leader);
         }
 
         /*
@@ -743,8 +744,11 @@ static inline int de_thread(struct task_struct *tsk)
         sig->flags = 0;
 
 no_thread_group:
-        BUG_ON(atomic_read(&sig->count) != 1);
         exit_itimers(sig);
+        if (leader)
+                release_task(leader);
+
+        BUG_ON(atomic_read(&sig->count) != 1);
 
         if (atomic_read(&oldsighand->count) == 1) {
                 /*
@@ -892,7 +896,7 @@ int flush_old_exec(struct linux_binprm * bprm)
         flush_thread();
 
         if (bprm->e_uid != current->euid || bprm->e_gid != current->egid || 
-            permission(bprm->file->f_dentry->d_inode,MAY_READ, NULL) ||
+            file_permission(bprm->file, MAY_READ) ||
             (bprm->interp_flags & BINPRM_FLAGS_ENFORCE_NONDUMP)) {
                 suid_keys(current);
                 current->mm->dumpable = suid_dumpable;