diff --git a/[refs] b/[refs] index cbe429880834..ac1c863e395a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 93ae86e759299718c611bc543b9b1633bf32905a +refs/heads/master: ad9c2b048b605fbc8d50526e330b88abdd631ab2 diff --git a/trunk/include/linux/security.h b/trunk/include/linux/security.h index fd4d55fb8845..e7d89b0c1fd8 100644 --- a/trunk/include/linux/security.h +++ b/trunk/include/linux/security.h @@ -1058,8 +1058,7 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts) * @cred points to the credentials to provide the context against which to * evaluate the security data on the key. * @perm describes the combination of permissions required of this key. - * Return 1 if permission granted, 0 if permission denied and -ve it the - * normal permissions model should be effected. + * Return 0 if permission is granted, -ve error otherwise. * @key_getsecurity: * Get a textual representation of the security context attached to a key * for the purposes of honouring KEYCTL_GETSECURITY. This function