LSM: Update function documentation for cap_capable
diff mbox series

Message ID 20190225221710.226552-1-mortonm@chromium.org
State New
Headers show
Series
  • LSM: Update function documentation for cap_capable
Related show

Commit Message

Micah Morton Feb. 25, 2019, 10:17 p.m. UTC
From: Micah Morton <mortonm@chromium.org>

This should have gone in with commit
c1a85a00ea66cb6f0bd0f14e47c28c2b0999799f.

Signed-off-by: Micah Morton <mortonm@chromium.org>
---
 security/commoncap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

James Morris Feb. 25, 2019, 11:17 p.m. UTC | #1
On Mon, 25 Feb 2019, mortonm@chromium.org wrote:

> From: Micah Morton <mortonm@chromium.org>
> 
> This should have gone in with commit
> c1a85a00ea66cb6f0bd0f14e47c28c2b0999799f.
> 
> Signed-off-by: Micah Morton <mortonm@chromium.org>

Thanks!

Applied to
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git next-general

> ---
>  security/commoncap.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/security/commoncap.c b/security/commoncap.c
> index 188eaf59f82f..f1d117c3d8ae 100644
> --- a/security/commoncap.c
> +++ b/security/commoncap.c
> @@ -57,7 +57,7 @@ static void warn_setuid_and_fcaps_mixed(const char *fname)
>   * @cred: The credentials to use
>   * @ns:  The user namespace in which we need the capability
>   * @cap: The capability to check for
> - * @audit: Whether to write an audit message or not
> + * @opts: Bitmask of options defined in include/linux/security.h
>   *
>   * Determine whether the nominated task has the specified capability amongst
>   * its effective set, returning 0 if it does, -ve if it does not.
>

Patch
diff mbox series

diff --git a/security/commoncap.c b/security/commoncap.c
index 188eaf59f82f..f1d117c3d8ae 100644
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -57,7 +57,7 @@  static void warn_setuid_and_fcaps_mixed(const char *fname)
  * @cred: The credentials to use
  * @ns:  The user namespace in which we need the capability
  * @cap: The capability to check for
- * @audit: Whether to write an audit message or not
+ * @opts: Bitmask of options defined in include/linux/security.h
  *
  * Determine whether the nominated task has the specified capability amongst
  * its effective set, returning 0 if it does, -ve if it does not.