---

yaml --- r: 169172 b: refs/heads/master c: c4a5af5 h: refs/heads/master v: v3
git-mirror · Nov 23, 2009 · b50d37e · b50d37e
1 parent bd75ba0
commit b50d37e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe542cf59bf0b31afe72b9e9749c0f6645419fa0
+refs/heads/master: c4a5af54c8ef277a59189fc9358e190f3c1b8206
diff --git a/trunk/kernel/capability.c b/trunk/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;