From b50d37e095e7cf6bedf0293e2c6e58a8bcd5752a Mon Sep 17 00:00:00 2001
From: "Andrew G. Morgan" <morgan@kernel.org>
Date: Mon, 23 Nov 2009 04:57:52 +0000
Subject: [PATCH] --- yaml --- r: 169172 b: refs/heads/master c:
 c4a5af54c8ef277a59189fc9358e190f3c1b8206 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/kernel/capability.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index fb1f59e0b0f5..7044644f6dfe 100644
--- 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
index c2316d3fa094..c450375e855f 100644
--- 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;