diff options
Diffstat (limited to 'kernel/capability.c')
| -rw-r--r-- | kernel/capability.c | 4 | 
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/capability.c b/kernel/capability.c index c2316d3fa09..c450375e855 100644 --- 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;  |