Commit 0f2a55d5 authored by Tetsuo Handa's avatar Tetsuo Handa Committed by James Morris

TOMOYO: Update kernel-doc.

Update comments for scripts/kernel-doc and fix some of errors reported by
scripts/checkpatch.pl .
Signed-off-by: default avatarTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parent c9206693
/* /*
* security/tomoyo/audit.c * security/tomoyo/audit.c
* *
* Pathname restriction functions. * Copyright (C) 2005-2011 NTT DATA CORPORATION
*
* Copyright (C) 2005-2010 NTT DATA CORPORATION
*/ */
#include "common.h" #include "common.h"
......
/* /*
* security/tomoyo/common.c * security/tomoyo/common.c
* *
* Common functions for TOMOYO. * Copyright (C) 2005-2011 NTT DATA CORPORATION
*
* Copyright (C) 2005-2010 NTT DATA CORPORATION
*/ */
#include <linux/uaccess.h> #include <linux/uaccess.h>
...@@ -775,6 +773,14 @@ static void tomoyo_read_profile(struct tomoyo_io_buffer *head) ...@@ -775,6 +773,14 @@ static void tomoyo_read_profile(struct tomoyo_io_buffer *head)
goto next; goto next;
} }
/**
* tomoyo_same_manager - Check for duplicated "struct tomoyo_manager" entry.
*
* @a: Pointer to "struct tomoyo_acl_head".
* @b: Pointer to "struct tomoyo_acl_head".
*
* Returns true if @a == @b, false otherwise.
*/
static bool tomoyo_same_manager(const struct tomoyo_acl_head *a, static bool tomoyo_same_manager(const struct tomoyo_acl_head *a,
const struct tomoyo_acl_head *b) const struct tomoyo_acl_head *b)
{ {
...@@ -1516,6 +1522,7 @@ static void tomoyo_read_pid(struct tomoyo_io_buffer *head) ...@@ -1516,6 +1522,7 @@ static void tomoyo_read_pid(struct tomoyo_io_buffer *head)
tomoyo_set_string(head, domain->domainname->name); tomoyo_set_string(head, domain->domainname->name);
} }
/* String table for domain transition control keywords. */
static const char *tomoyo_transition_type[TOMOYO_MAX_TRANSITION_TYPE] = { static const char *tomoyo_transition_type[TOMOYO_MAX_TRANSITION_TYPE] = {
[TOMOYO_TRANSITION_CONTROL_NO_RESET] = "no_reset_domain ", [TOMOYO_TRANSITION_CONTROL_NO_RESET] = "no_reset_domain ",
[TOMOYO_TRANSITION_CONTROL_RESET] = "reset_domain ", [TOMOYO_TRANSITION_CONTROL_RESET] = "reset_domain ",
...@@ -1525,6 +1532,7 @@ static const char *tomoyo_transition_type[TOMOYO_MAX_TRANSITION_TYPE] = { ...@@ -1525,6 +1532,7 @@ static const char *tomoyo_transition_type[TOMOYO_MAX_TRANSITION_TYPE] = {
[TOMOYO_TRANSITION_CONTROL_KEEP] = "keep_domain ", [TOMOYO_TRANSITION_CONTROL_KEEP] = "keep_domain ",
}; };
/* String table for grouping keywords. */
static const char *tomoyo_group_name[TOMOYO_MAX_GROUP] = { static const char *tomoyo_group_name[TOMOYO_MAX_GROUP] = {
[TOMOYO_PATH_GROUP] = "path_group ", [TOMOYO_PATH_GROUP] = "path_group ",
[TOMOYO_NUMBER_GROUP] = "number_group ", [TOMOYO_NUMBER_GROUP] = "number_group ",
......
/* /*
* security/tomoyo/domain.c * security/tomoyo/domain.c
* *
* Domain transition functions for TOMOYO. * Copyright (C) 2005-2011 NTT DATA CORPORATION
*
* Copyright (C) 2005-2010 NTT DATA CORPORATION
*/ */
#include "common.h" #include "common.h"
...@@ -182,10 +180,10 @@ LIST_HEAD(tomoyo_domain_list); ...@@ -182,10 +180,10 @@ LIST_HEAD(tomoyo_domain_list);
*/ */
static const char *tomoyo_last_word(const char *name) static const char *tomoyo_last_word(const char *name)
{ {
const char *cp = strrchr(name, ' '); const char *cp = strrchr(name, ' ');
if (cp) if (cp)
return cp + 1; return cp + 1;
return name; return name;
} }
/** /**
......
/* /*
* security/tomoyo/file.c * security/tomoyo/file.c
* *
* Pathname restriction functions. * Copyright (C) 2005-2011 NTT DATA CORPORATION
*
* Copyright (C) 2005-2010 NTT DATA CORPORATION
*/ */
#include "common.h" #include "common.h"
...@@ -154,7 +152,7 @@ static bool tomoyo_get_realpath(struct tomoyo_path_info *buf, struct path *path) ...@@ -154,7 +152,7 @@ static bool tomoyo_get_realpath(struct tomoyo_path_info *buf, struct path *path)
tomoyo_fill_path_info(buf); tomoyo_fill_path_info(buf);
return true; return true;
} }
return false; return false;
} }
/** /**
...@@ -883,16 +881,16 @@ int tomoyo_path2_perm(const u8 operation, struct path *path1, ...@@ -883,16 +881,16 @@ int tomoyo_path2_perm(const u8 operation, struct path *path1,
switch (operation) { switch (operation) {
struct dentry *dentry; struct dentry *dentry;
case TOMOYO_TYPE_RENAME: case TOMOYO_TYPE_RENAME:
case TOMOYO_TYPE_LINK: case TOMOYO_TYPE_LINK:
dentry = path1->dentry; dentry = path1->dentry;
if (!dentry->d_inode || !S_ISDIR(dentry->d_inode->i_mode)) if (!dentry->d_inode || !S_ISDIR(dentry->d_inode->i_mode))
break; break;
/* fall through */ /* fall through */
case TOMOYO_TYPE_PIVOT_ROOT: case TOMOYO_TYPE_PIVOT_ROOT:
tomoyo_add_slash(&buf1); tomoyo_add_slash(&buf1);
tomoyo_add_slash(&buf2); tomoyo_add_slash(&buf2);
break; break;
} }
r.obj = &obj; r.obj = &obj;
r.param_type = TOMOYO_TYPE_PATH2_ACL; r.param_type = TOMOYO_TYPE_PATH2_ACL;
r.param.path2.operation = operation; r.param.path2.operation = operation;
......
/* /*
* security/tomoyo/gc.c * security/tomoyo/gc.c
* *
* Implementation of the Domain-Based Mandatory Access Control. * Copyright (C) 2005-2011 NTT DATA CORPORATION
*
* Copyright (C) 2005-2010 NTT DATA CORPORATION
*
*/ */
#include "common.h" #include "common.h"
...@@ -455,7 +452,7 @@ static bool tomoyo_collect_member(const enum tomoyo_policy_id id, ...@@ -455,7 +452,7 @@ static bool tomoyo_collect_member(const enum tomoyo_policy_id id,
if (!tomoyo_add_to_gc(id, &member->list)) if (!tomoyo_add_to_gc(id, &member->list))
return false; return false;
} }
return true; return true;
} }
/** /**
......
/* /*
* security/tomoyo/group.c * security/tomoyo/group.c
* *
* Copyright (C) 2005-2010 NTT DATA CORPORATION * Copyright (C) 2005-2011 NTT DATA CORPORATION
*/ */
#include <linux/slab.h> #include <linux/slab.h>
#include "common.h" #include "common.h"
/**
* tomoyo_same_path_group - Check for duplicated "struct tomoyo_path_group" entry.
*
* @a: Pointer to "struct tomoyo_acl_head".
* @b: Pointer to "struct tomoyo_acl_head".
*
* Returns true if @a == @b, false otherwise.
*/
static bool tomoyo_same_path_group(const struct tomoyo_acl_head *a, static bool tomoyo_same_path_group(const struct tomoyo_acl_head *a,
const struct tomoyo_acl_head *b) const struct tomoyo_acl_head *b)
{ {
return container_of(a, struct tomoyo_path_group, head)->member_name == return container_of(a, struct tomoyo_path_group, head)->member_name ==
container_of(b, struct tomoyo_path_group, head)->member_name; container_of(b, struct tomoyo_path_group, head)->member_name;
} }
/**
* tomoyo_same_number_group - Check for duplicated "struct tomoyo_number_group" entry.
*
* @a: Pointer to "struct tomoyo_acl_head".
* @b: Pointer to "struct tomoyo_acl_head".
*
* Returns true if @a == @b, false otherwise.
*/
static bool tomoyo_same_number_group(const struct tomoyo_acl_head *a, static bool tomoyo_same_number_group(const struct tomoyo_acl_head *a,
const struct tomoyo_acl_head *b) const struct tomoyo_acl_head *b)
{ {
return !memcmp(&container_of(a, struct tomoyo_number_group, head) return !memcmp(&container_of(a, struct tomoyo_number_group, head)
->number, ->number,
...@@ -29,7 +45,7 @@ static bool tomoyo_same_number_group(const struct tomoyo_acl_head *a, ...@@ -29,7 +45,7 @@ static bool tomoyo_same_number_group(const struct tomoyo_acl_head *a,
* tomoyo_write_group - Write "struct tomoyo_path_group"/"struct tomoyo_number_group" list. * tomoyo_write_group - Write "struct tomoyo_path_group"/"struct tomoyo_number_group" list.
* *
* @param: Pointer to "struct tomoyo_acl_param". * @param: Pointer to "struct tomoyo_acl_param".
* @type: Type of this group. * @type: Type of this group.
* *
* Returns 0 on success, negative value otherwise. * Returns 0 on success, negative value otherwise.
*/ */
...@@ -70,8 +86,8 @@ int tomoyo_write_group(struct tomoyo_acl_param *param, const u8 type) ...@@ -70,8 +86,8 @@ int tomoyo_write_group(struct tomoyo_acl_param *param, const u8 type)
/** /**
* tomoyo_path_matches_group - Check whether the given pathname matches members of the given pathname group. * tomoyo_path_matches_group - Check whether the given pathname matches members of the given pathname group.
* *
* @pathname: The name of pathname. * @pathname: The name of pathname.
* @group: Pointer to "struct tomoyo_path_group". * @group: Pointer to "struct tomoyo_path_group".
* *
* Returns matched member's pathname if @pathname matches pathnames in @group, * Returns matched member's pathname if @pathname matches pathnames in @group,
* NULL otherwise. * NULL otherwise.
......
/* /*
* security/tomoyo/load_policy.c * security/tomoyo/load_policy.c
* *
* Policy loader launcher for TOMOYO. * Copyright (C) 2005-2011 NTT DATA CORPORATION
*
* Copyright (C) 2005-2010 NTT DATA CORPORATION
*/ */
#include "common.h" #include "common.h"
......
/* /*
* security/tomoyo/memory.c * security/tomoyo/memory.c
* *
* Memory management functions for TOMOYO. * Copyright (C) 2005-2011 NTT DATA CORPORATION
*
* Copyright (C) 2005-2010 NTT DATA CORPORATION
*/ */
#include <linux/hash.h> #include <linux/hash.h>
......
/* /*
* security/tomoyo/mount.c * security/tomoyo/mount.c
* *
* Copyright (C) 2005-2010 NTT DATA CORPORATION * Copyright (C) 2005-2011 NTT DATA CORPORATION
*/ */
#include <linux/slab.h> #include <linux/slab.h>
...@@ -62,7 +62,7 @@ static bool tomoyo_check_mount_acl(struct tomoyo_request_info *r, ...@@ -62,7 +62,7 @@ static bool tomoyo_check_mount_acl(struct tomoyo_request_info *r,
* tomoyo_mount_acl - Check permission for mount() operation. * tomoyo_mount_acl - Check permission for mount() operation.
* *
* @r: Pointer to "struct tomoyo_request_info". * @r: Pointer to "struct tomoyo_request_info".
* @dev_name: Name of device file. * @dev_name: Name of device file. Maybe NULL.
* @dir: Pointer to "struct path". * @dir: Pointer to "struct path".
* @type: Name of filesystem type. * @type: Name of filesystem type.
* @flags: Mount options. * @flags: Mount options.
...@@ -175,11 +175,11 @@ static int tomoyo_mount_acl(struct tomoyo_request_info *r, char *dev_name, ...@@ -175,11 +175,11 @@ static int tomoyo_mount_acl(struct tomoyo_request_info *r, char *dev_name,
/** /**
* tomoyo_mount_permission - Check permission for mount() operation. * tomoyo_mount_permission - Check permission for mount() operation.
* *
* @dev_name: Name of device file. * @dev_name: Name of device file. Maybe NULL.
* @path: Pointer to "struct path". * @path: Pointer to "struct path".
* @type: Name of filesystem type. May be NULL. * @type: Name of filesystem type. Maybe NULL.
* @flags: Mount options. * @flags: Mount options.
* @data_page: Optional data. May be NULL. * @data_page: Optional data. Maybe NULL.
* *
* Returns 0 on success, negative value otherwise. * Returns 0 on success, negative value otherwise.
*/ */
......
/* /*
* security/tomoyo/realpath.c * security/tomoyo/realpath.c
* *
* Pathname calculation functions for TOMOYO. * Copyright (C) 2005-2011 NTT DATA CORPORATION
*
* Copyright (C) 2005-2010 NTT DATA CORPORATION
*/ */
#include <linux/types.h> #include <linux/types.h>
......
/* /*
* security/tomoyo/common.c * security/tomoyo/securityfs_if.c
* *
* Securityfs interface for TOMOYO. * Copyright (C) 2005-2011 NTT DATA CORPORATION
*
* Copyright (C) 2005-2010 NTT DATA CORPORATION
*/ */
#include <linux/security.h> #include <linux/security.h>
......
This diff is collapsed.
/* /*
* security/tomoyo/util.c * security/tomoyo/util.c
* *
* Utility functions for TOMOYO. * Copyright (C) 2005-2011 NTT DATA CORPORATION
*
* Copyright (C) 2005-2010 NTT DATA CORPORATION
*/ */
#include <linux/slab.h> #include <linux/slab.h>
...@@ -378,7 +376,7 @@ void tomoyo_normalize_line(unsigned char *buffer) ...@@ -378,7 +376,7 @@ void tomoyo_normalize_line(unsigned char *buffer)
/** /**
* tomoyo_correct_word2 - Validate a string. * tomoyo_correct_word2 - Validate a string.
* *
* @string: The string to check. May be non-'\0'-terminated. * @string: The string to check. Maybe non-'\0'-terminated.
* @len: Length of @string. * @len: Length of @string.
* *
* Check whether the given string follows the naming rules. * Check whether the given string follows the naming rules.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment