Silence the existing API for capability version compatibility check.

[mv-sheeva.git] / kernel / capability.c

diff --git a/kernel/capability.c b/kernel/capability.c
index c2316d3fa0943004ff7a46ae2b058fc745d1fc62..c450375e855fcbafd20f95dabff005db4bd5099a 100644 (file)
--- a/kernel/capability.c
+++ b/kernel/capability.c
@@ -169,8 +169,8 @@ SYSCALL_DEFINE2(capget, cap_user_header_t, header, cap_user_data_t, dataptr)
        kernel_cap_t pE, pI, pP;
 
        ret = cap_validate_magic(header, &tocopy);
-       if (ret != 0)
-               return ret;
+       if ((dataptr == NULL) || (ret != 0))
+               return ((dataptr == NULL) && (ret == -EINVAL)) ? 0 : ret;
 
        if (get_user(pid, &header->pid))
                return -EFAULT;