Skip to contentSkip to conversation

exec: setup_arg_pages fails to return errors

PATCH In review Anton Blanchard 3 participants 3 messages Oct 18, 2009 – Oct 21, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 exec: setup_arg_pages fails to return errors

In setup_arg_pages we work hard to assign a value to ret, but on exit we always return 0.

Also remove a now duplicated exit path and branch to out_unlock instead.

---

fs/exec.c +3 -5
Index: linux.trees.git/fs/exec.c
===================================================================
@@ -624,10 +624,8 @@ int setup_arg_pages(struct linux_binprm 
 	/* Move stack pages down in memory. */
 	if (stack_shift) {
 		ret = shift_arg_pages(vma, stack_shift);
-		if (ret) {
-			up_write(&mm->mmap_sem);
-			return ret;
-		}
+		if (ret)
+			goto out_unlock;
 	}
 
 #ifdef CONFIG_STACK_GROWSUP
@@ -641,7 +639,7 @@ int setup_arg_pages(struct linux_binprm 
 
 out_unlock:
 	up_write(&mm->mmap_sem);
-	return 0;
+	return ret;
 }
 EXPORT_SYMBOL(setup_arg_pages);
 
Acked-by Serge Hallyn on v1 1/1
#1 lore raw
Quoted 7 lines · Anton Blanchard

In setup_arg_pages we work hard to assign a value to ret, but on exit we always return 0.

Also remove a now duplicated exit path and branch to out_unlock instead.

Yikes!

Quoted 33 lines

---

Index: linux.trees.git/fs/exec.c
===================================================================

fs/exec.c +3 -6
@@ -624,10 +624,8 @@ int setup_arg_pages(struct linux_binprm 
 	/* Move stack pages down in memory. */
 	if (stack_shift) {
 		ret = shift_arg_pages(vma, stack_shift);
-		if (ret) {
-			up_write(&mm->mmap_sem);
-			return ret;
-		}
+		if (ret)
+			goto out_unlock;
 	}
 
 #ifdef CONFIG_STACK_GROWSUP
@@ -641,7 +639,7 @@ int setup_arg_pages(struct linux_binprm 
 
 out_unlock:
 	up_write(&mm->mmap_sem);
-	return 0;
+	return ret;
 }
 EXPORT_SYMBOL(setup_arg_pages);
 
--

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Reviewed-by on v1 1/1
#2 lore raw
In reply to Anton Blanchard
Quoted 8 lines · Anton Blanchard

In setup_arg_pages we work hard to assign a value to ret, but on exit we always return 0.

Also remove a now duplicated exit path and branch to out_unlock instead.

---

Quoted 33 lines

Index: linux.trees.git/fs/exec.c
===================================================================

fs/exec.c   2009-09-28 12:17:58.000000000 +1000 renamed from fs/exec.c      2009-09-28 12:17:10.000000000 +1000 +2 -4
@@ -624,10 +624,8 @@ int setup_arg_pages(struct linux_binprm
        /* Move stack pages down in memory. */
        if (stack_shift) {
                ret = shift_arg_pages(vma, stack_shift);
-               if (ret) {
-                       up_write(&mm->mmap_sem);
-                       return ret;
-               }
+               if (ret)
+                       goto out_unlock;
        }
 
  #ifdef CONFIG_STACK_GROWSUP
@@ -641,7 +639,7 @@ int setup_arg_pages(struct linux_binprm
 

 out_unlock:
       up_write(&mm->mmap_sem);
-       return 0;
+       return ret;
 }
 EXPORT_SYMBOL(setup_arg_pages);

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/