Skip to content

Commit

Permalink
TOMOYO: Use shorter names.
Browse files Browse the repository at this point in the history 
Use shorter name to reduce newlines needed for 80 columns limit.

Signed-off-by: Tetsuo Handa <[email protected]>
Signed-off-by: James Morris <[email protected]>
  • Loading branch information
Tetsuo Handa authored and James Morris committed Feb 16, 2010
1 parent 084da35 commit 7ef6123
Show file tree
Hide file tree
Showing 5 changed files with 250 additions and 299 deletions.
74 changes: 31 additions & 43 deletions security/tomoyo/common.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -841,25 +841,22 @@ bool tomoyo_domain_quota_is_ok(struct tomoyo_domain_info * const domain)
return true;
list_for_each_entry_rcu(ptr, &domain->acl_info_list, list) {
switch (ptr->type) {
struct tomoyo_single_path_acl_record *acl;
struct tomoyo_path_acl *acl;
u32 perm;
u8 i;
case TOMOYO_TYPE_SINGLE_PATH_ACL:
acl = container_of(ptr,
struct tomoyo_single_path_acl_record,
head);
case TOMOYO_TYPE_PATH_ACL:
acl = container_of(ptr, struct tomoyo_path_acl, head);
perm = acl->perm | (((u32) acl->perm_high) << 16);
for (i = 0; i < TOMOYO_MAX_SINGLE_PATH_OPERATION; i++)
for (i = 0; i < TOMOYO_MAX_PATH_OPERATION; i++)
if (perm & (1 << i))
count++;
if (perm & (1 << TOMOYO_TYPE_READ_WRITE_ACL))
if (perm & (1 << TOMOYO_TYPE_READ_WRITE))
count -= 2;
break;
case TOMOYO_TYPE_DOUBLE_PATH_ACL:
perm = container_of(ptr,
struct tomoyo_double_path_acl_record,
head)->perm;
for (i = 0; i < TOMOYO_MAX_DOUBLE_PATH_OPERATION; i++)
case TOMOYO_TYPE_PATH2_ACL:
perm = container_of(ptr, struct tomoyo_path2_acl, head)
->perm;
for (i = 0; i < TOMOYO_MAX_PATH2_OPERATION; i++)
if (perm & (1 << i))
count++;
break;
Expand Down Expand Up @@ -1366,16 +1363,15 @@ static int tomoyo_write_domain_policy(struct tomoyo_io_buffer *head)
}

/**
* tomoyo_print_single_path_acl - Print a single path ACL entry.
* tomoyo_print_path_acl - Print a single path ACL entry.
*
* @head: Pointer to "struct tomoyo_io_buffer".
* @ptr: Pointer to "struct tomoyo_single_path_acl_record".
* @ptr: Pointer to "struct tomoyo_path_acl".
*
* Returns true on success, false otherwise.
*/
static bool tomoyo_print_single_path_acl(struct tomoyo_io_buffer *head,
struct tomoyo_single_path_acl_record *
ptr)
static bool tomoyo_print_path_acl(struct tomoyo_io_buffer *head,
struct tomoyo_path_acl *ptr)
{
int pos;
u8 bit;
Expand All @@ -1384,17 +1380,15 @@ static bool tomoyo_print_single_path_acl(struct tomoyo_io_buffer *head,
const u32 perm = ptr->perm | (((u32) ptr->perm_high) << 16);

filename = ptr->filename->name;
for (bit = head->read_bit; bit < TOMOYO_MAX_SINGLE_PATH_OPERATION;
bit++) {
for (bit = head->read_bit; bit < TOMOYO_MAX_PATH_OPERATION; bit++) {
const char *msg;
if (!(perm & (1 << bit)))
continue;
/* Print "read/write" instead of "read" and "write". */
if ((bit == TOMOYO_TYPE_READ_ACL ||
bit == TOMOYO_TYPE_WRITE_ACL)
&& (perm & (1 << TOMOYO_TYPE_READ_WRITE_ACL)))
if ((bit == TOMOYO_TYPE_READ || bit == TOMOYO_TYPE_WRITE)
&& (perm & (1 << TOMOYO_TYPE_READ_WRITE)))
continue;
msg = tomoyo_sp2keyword(bit);
msg = tomoyo_path2keyword(bit);
pos = head->read_avail;
if (!tomoyo_io_printf(head, "allow_%s %s%s\n", msg,
atmark, filename))
Expand All @@ -1409,16 +1403,15 @@ static bool tomoyo_print_single_path_acl(struct tomoyo_io_buffer *head,
}

/**
* tomoyo_print_double_path_acl - Print a double path ACL entry.
* tomoyo_print_path2_acl - Print a double path ACL entry.
*
* @head: Pointer to "struct tomoyo_io_buffer".
* @ptr: Pointer to "struct tomoyo_double_path_acl_record".
* @ptr: Pointer to "struct tomoyo_path2_acl".
*
* Returns true on success, false otherwise.
*/
static bool tomoyo_print_double_path_acl(struct tomoyo_io_buffer *head,
struct tomoyo_double_path_acl_record *
ptr)
static bool tomoyo_print_path2_acl(struct tomoyo_io_buffer *head,
struct tomoyo_path2_acl *ptr)
{
int pos;
const char *atmark1 = "";
Expand All @@ -1430,12 +1423,11 @@ static bool tomoyo_print_double_path_acl(struct tomoyo_io_buffer *head,

filename1 = ptr->filename1->name;
filename2 = ptr->filename2->name;
for (bit = head->read_bit; bit < TOMOYO_MAX_DOUBLE_PATH_OPERATION;
bit++) {
for (bit = head->read_bit; bit < TOMOYO_MAX_PATH2_OPERATION; bit++) {
const char *msg;
if (!(perm & (1 << bit)))
continue;
msg = tomoyo_dp2keyword(bit);
msg = tomoyo_path22keyword(bit);
pos = head->read_avail;
if (!tomoyo_io_printf(head, "allow_%s %s%s %s%s\n", msg,
atmark1, filename1, atmark2, filename2))
Expand All @@ -1462,19 +1454,15 @@ static bool tomoyo_print_entry(struct tomoyo_io_buffer *head,
{
const u8 acl_type = ptr->type;

if (acl_type == TOMOYO_TYPE_SINGLE_PATH_ACL) {
struct tomoyo_single_path_acl_record *acl
= container_of(ptr,
struct tomoyo_single_path_acl_record,
head);
return tomoyo_print_single_path_acl(head, acl);
if (acl_type == TOMOYO_TYPE_PATH_ACL) {
struct tomoyo_path_acl *acl
= container_of(ptr, struct tomoyo_path_acl, head);
return tomoyo_print_path_acl(head, acl);
}
if (acl_type == TOMOYO_TYPE_DOUBLE_PATH_ACL) {
struct tomoyo_double_path_acl_record *acl
= container_of(ptr,
struct tomoyo_double_path_acl_record,
head);
return tomoyo_print_double_path_acl(head, acl);
if (acl_type == TOMOYO_TYPE_PATH2_ACL) {
struct tomoyo_path2_acl *acl
= container_of(ptr, struct tomoyo_path2_acl, head);
return tomoyo_print_path2_acl(head, acl);
}
BUG(); /* This must not happen. */
return false;
Expand Down
90 changes: 44 additions & 46 deletions security/tomoyo/common.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ enum tomoyo_mac_index {

/* Index numbers for Access Controls. */
enum tomoyo_acl_entry_type_index {
TOMOYO_TYPE_SINGLE_PATH_ACL,
TOMOYO_TYPE_DOUBLE_PATH_ACL,
TOMOYO_TYPE_PATH_ACL,
TOMOYO_TYPE_PATH2_ACL,
};

/* Index numbers for File Controls. */
Expand All @@ -87,36 +87,36 @@ enum tomoyo_acl_entry_type_index {
*/

enum tomoyo_path_acl_index {
TOMOYO_TYPE_READ_WRITE_ACL,
TOMOYO_TYPE_EXECUTE_ACL,
TOMOYO_TYPE_READ_ACL,
TOMOYO_TYPE_WRITE_ACL,
TOMOYO_TYPE_CREATE_ACL,
TOMOYO_TYPE_UNLINK_ACL,
TOMOYO_TYPE_MKDIR_ACL,
TOMOYO_TYPE_RMDIR_ACL,
TOMOYO_TYPE_MKFIFO_ACL,
TOMOYO_TYPE_MKSOCK_ACL,
TOMOYO_TYPE_MKBLOCK_ACL,
TOMOYO_TYPE_MKCHAR_ACL,
TOMOYO_TYPE_TRUNCATE_ACL,
TOMOYO_TYPE_SYMLINK_ACL,
TOMOYO_TYPE_REWRITE_ACL,
TOMOYO_TYPE_IOCTL_ACL,
TOMOYO_TYPE_CHMOD_ACL,
TOMOYO_TYPE_CHOWN_ACL,
TOMOYO_TYPE_CHGRP_ACL,
TOMOYO_TYPE_CHROOT_ACL,
TOMOYO_TYPE_MOUNT_ACL,
TOMOYO_TYPE_UMOUNT_ACL,
TOMOYO_MAX_SINGLE_PATH_OPERATION
TOMOYO_TYPE_READ_WRITE,
TOMOYO_TYPE_EXECUTE,
TOMOYO_TYPE_READ,
TOMOYO_TYPE_WRITE,
TOMOYO_TYPE_CREATE,
TOMOYO_TYPE_UNLINK,
TOMOYO_TYPE_MKDIR,
TOMOYO_TYPE_RMDIR,
TOMOYO_TYPE_MKFIFO,
TOMOYO_TYPE_MKSOCK,
TOMOYO_TYPE_MKBLOCK,
TOMOYO_TYPE_MKCHAR,
TOMOYO_TYPE_TRUNCATE,
TOMOYO_TYPE_SYMLINK,
TOMOYO_TYPE_REWRITE,
TOMOYO_TYPE_IOCTL,
TOMOYO_TYPE_CHMOD,
TOMOYO_TYPE_CHOWN,
TOMOYO_TYPE_CHGRP,
TOMOYO_TYPE_CHROOT,
TOMOYO_TYPE_MOUNT,
TOMOYO_TYPE_UMOUNT,
TOMOYO_MAX_PATH_OPERATION
};

enum tomoyo_path2_acl_index {
TOMOYO_TYPE_LINK_ACL,
TOMOYO_TYPE_RENAME_ACL,
TOMOYO_TYPE_PIVOT_ROOT_ACL,
TOMOYO_MAX_DOUBLE_PATH_OPERATION
TOMOYO_TYPE_LINK,
TOMOYO_TYPE_RENAME,
TOMOYO_TYPE_PIVOT_ROOT,
TOMOYO_MAX_PATH2_OPERATION
};

enum tomoyo_securityfs_interface_index {
Expand Down Expand Up @@ -210,12 +210,11 @@ struct tomoyo_path_info_with_data {
* (1) "list" which is linked to the ->acl_info_list of
* "struct tomoyo_domain_info"
* (2) "type" which tells type of the entry (either
* "struct tomoyo_single_path_acl_record" or
* "struct tomoyo_double_path_acl_record").
* "struct tomoyo_path_acl" or "struct tomoyo_path2_acl").
*
* Packing "struct tomoyo_acl_info" allows
* "struct tomoyo_single_path_acl_record" to embed "u8" + "u16" and
* "struct tomoyo_double_path_acl_record" to embed "u8"
* "struct tomoyo_path_acl" to embed "u8" + "u16" and
* "struct tomoyo_path2_acl" to embed "u8"
* without enlarging their structure size.
*/
struct tomoyo_acl_info {
Expand Down Expand Up @@ -269,7 +268,7 @@ struct tomoyo_domain_info {
};

/*
* tomoyo_single_path_acl_record is a structure which is used for holding an
* tomoyo_path_acl is a structure which is used for holding an
* entry with one pathname operation (e.g. open(), mkdir()).
* It has following fields.
*
Expand All @@ -284,16 +283,16 @@ struct tomoyo_domain_info {
* "allow_chmod", "allow_chown", "allow_chgrp", "allow_chroot", "allow_mount"
* and "allow_unmount".
*/
struct tomoyo_single_path_acl_record {
struct tomoyo_acl_info head; /* type = TOMOYO_TYPE_SINGLE_PATH_ACL */
struct tomoyo_path_acl {
struct tomoyo_acl_info head; /* type = TOMOYO_TYPE_PATH_ACL */
u8 perm_high;
u16 perm;
/* Pointer to single pathname. */
const struct tomoyo_path_info *filename;
};

/*
* tomoyo_double_path_acl_record is a structure which is used for holding an
* tomoyo_path2_acl is a structure which is used for holding an
* entry with two pathnames operation (i.e. link(), rename() and pivot_root()).
* It has following fields.
*
Expand All @@ -305,8 +304,8 @@ struct tomoyo_single_path_acl_record {
* Directives held by this structure are "allow_rename", "allow_link" and
* "allow_pivot_root".
*/
struct tomoyo_double_path_acl_record {
struct tomoyo_acl_info head; /* type = TOMOYO_TYPE_DOUBLE_PATH_ACL */
struct tomoyo_path2_acl {
struct tomoyo_acl_info head; /* type = TOMOYO_TYPE_PATH2_ACL */
u8 perm;
/* Pointer to single pathname. */
const struct tomoyo_path_info *filename1;
Expand Down Expand Up @@ -550,13 +549,13 @@ bool tomoyo_read_no_rewrite_policy(struct tomoyo_io_buffer *head);
/* Write domain policy violation warning message to console? */
bool tomoyo_verbose_mode(const struct tomoyo_domain_info *domain);
/* Convert double path operation to operation name. */
const char *tomoyo_dp2keyword(const u8 operation);
const char *tomoyo_path22keyword(const u8 operation);
/* Get the last component of the given domainname. */
const char *tomoyo_get_last_name(const struct tomoyo_domain_info *domain);
/* Get warning message. */
const char *tomoyo_get_msg(const bool is_enforce);
/* Convert single path operation to operation name. */
const char *tomoyo_sp2keyword(const u8 operation);
const char *tomoyo_path2keyword(const u8 operation);
/* Create "alias" entry in exception policy. */
int tomoyo_write_alias_policy(char *data, const bool is_delete);
/*
Expand Down Expand Up @@ -638,11 +637,10 @@ int tomoyo_check_exec_perm(struct tomoyo_domain_info *domain,
const struct tomoyo_path_info *filename);
int tomoyo_check_open_permission(struct tomoyo_domain_info *domain,
struct path *path, const int flag);
int tomoyo_check_1path_perm(struct tomoyo_domain_info *domain,
const u8 operation, struct path *path);
int tomoyo_check_2path_perm(struct tomoyo_domain_info *domain,
const u8 operation, struct path *path1,
struct path *path2);
int tomoyo_path_perm(struct tomoyo_domain_info *domain, const u8 operation,
struct path *path);
int tomoyo_path2_perm(struct tomoyo_domain_info *domain, const u8 operation,
struct path *path1, struct path *path2);
int tomoyo_check_rewrite_permission(struct tomoyo_domain_info *domain,
struct file *filp);
int tomoyo_find_next_domain(struct linux_binprm *bprm);
Expand Down
Loading

0 comments on commit 7ef6123

Please sign in to comment.