Re: [PATCH] Fix sys_capset in 2.5.20+patches...

[Robert Love <rml@tech9.net>]

On Wed, 2002-06-05 at 19:07, Peter Chubb wrote:

> 	The current head-of-bk-tree 2.5 kernel breaks capset() (and so
> named, for one, won't run).  SYS_setcap() will *always* return -EINVAL
> with the current tree.

Ugh, do I really need braces there???

(there is another occurrence of this, too... brown paper bag me)

Linus, please apply this patch.  Against 2.5-bk...

	Robert Love

--- linux-2.5.20/kernel/capability.c	Wed Jun  5 19:16:11 2002
+++ linux/kernel/capability.c	Wed Jun  5 19:15:49 2002
@@ -39,13 +39,14 @@
      if (get_user(version, &header->version))
 	     return -EFAULT;
 
-     if (version != _LINUX_CAPABILITY_VERSION)
+     if (version != _LINUX_CAPABILITY_VERSION) {
 	     if (put_user(_LINUX_CAPABILITY_VERSION, &header->version))
 		     return -EFAULT; 
              return -EINVAL;
+     }
 
      if (get_user(pid, &header->pid))
-	     return -EFAULT; 
+	     return -EFAULT;
 
      if (pid < 0) 
              return -EINVAL;
@@ -134,10 +135,11 @@
      if (get_user(version, &header->version))
 	     return -EFAULT; 
 
-     if (version != _LINUX_CAPABILITY_VERSION)
+     if (version != _LINUX_CAPABILITY_VERSION) {
 	     if (put_user(_LINUX_CAPABILITY_VERSION, &header->version))
 		     return -EFAULT; 
              return -EINVAL;
+     }
 
      if (get_user(pid, &header->pid))
 	     return -EFAULT;