lsm: move the fs_context hook comments to security/security.c

This patch relocates the LSM hook function comments to the function
definitions, in keeping with the current kernel conventions.  This
should make the hook descriptions more easily discoverable and easier
to maintain.

While formatting changes have been done to better fit the kernel-doc
style, content changes have been kept to a minimum and limited to
text which was obviously incorrect and/or outdated.  It is expected
the future patches will improve the quality of the function header
comments.

Acked-by: Casey Schaufler <casey@schaufler-ca.com>
Signed-off-by: Paul Moore <paul@paul-moore.com>

diff --git a/include/linux/lsm_hooks.h b/include/linux/lsm_hooks.h
index 784e19fd665b31efdf131db71014d232d8a1afa7..a37f3a3809186963dc6439d4e8484efa39ed8598 100644 (file)
--- a/include/linux/lsm_hooks.h
+++ b/include/linux/lsm_hooks.h
@@ -32,23 +32,6 @@
 /**
  * union security_list_options - Linux Security Module hook function list
  *
- * Security hooks for mount using fs_context.
- *     [See also Documentation/filesystems/mount_api.rst]
- *
- * @fs_context_dup:
- *     Allocate and attach a security structure to sc->security.  This pointer
- *     is initialised to NULL by the caller.
- *     @fc indicates the new filesystem context.
- *     @src_fc indicates the original filesystem context.
- *     Return 0 on success or a negative error code on failure.
- * @fs_context_parse_param:
- *     Userspace provided a parameter to configure a superblock.  The LSM may
- *     reject it with an error and may use it for itself, in which case it
- *     should return 0; otherwise it should return -ENOPARAM to pass it on to
- *     the filesystem.
- *     @fc indicates the filesystem context.
- *     @param The parameter.
- *
  * Security hooks for filesystem operations.
  *
  * @sb_alloc_security:

diff --git a/security/security.c b/security/security.c
index 1e7dbaf9ad284af57eb23df4d10bb9ffd93b051d..64c8805570b16e2e1072382080a3d1fb3d5f15be 100644 (file)
--- a/security/security.c
+++ b/security/security.c
@@ -979,11 +979,34 @@ void security_bprm_committed_creds(struct linux_binprm *bprm)
        call_void_hook(bprm_committed_creds, bprm);
 }
 
+/**
+ * security_fs_context_dup() - Duplicate a fs_context LSM blob
+ * @fc: destination filesystem context
+ * @src_fc: source filesystem context
+ *
+ * Allocate and attach a security structure to sc->security.  This pointer is
+ * initialised to NULL by the caller.  @fc indicates the new filesystem context.
+ * @src_fc indicates the original filesystem context.
+ *
+ * Return: Returns 0 on success or a negative error code on failure.
+ */
 int security_fs_context_dup(struct fs_context *fc, struct fs_context *src_fc)
 {
        return call_int_hook(fs_context_dup, 0, fc, src_fc);
 }
 
+/**
+ * security_fs_context_parse_param() - Configure a filesystem context
+ * @fc: filesystem context
+ * @param: filesystem parameter
+ *
+ * Userspace provided a parameter to configure a superblock.  The LSM can
+ * consume the parameter or return it to the caller for use elsewhere.
+ *
+ * Return: If the parameter is used by the LSM it should return 0, if it is
+ *         returned to the caller -ENOPARAM is returned, otherwise a negative
+ *         error code is returned.
+ */
 int security_fs_context_parse_param(struct fs_context *fc,
                                    struct fs_parameter *param)
 {