dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

Merge branch 'next-queue' into next

This commit is contained in:
James Morris 2010-03-09 12:46:47 +11:00
parent eaa5eec739 634a539e16
commit c43a752347
9 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
security/keys/keyring.c
View File

@ -170,12 +170,10 @@ static void keyring_describe(const struct key *keyring, struct seq_file *m)
{ {
struct keyring_list *klist; struct keyring_list *klist;
if (keyring->description) { if (keyring->description)
seq_puts(m, keyring->description); seq_puts(m, keyring->description);
} else
else {
seq_puts(m, "[anon]"); seq_puts(m, "[anon]");
}
rcu_read_lock(); rcu_read_lock();
klist = rcu_dereference(keyring->payload.subscriptions); klist = rcu_dereference(keyring->payload.subscriptions);

2
security/security.c
View File

@ -117,7 +117,7 @@ int __init security_module_enable(struct security_operations *ops)
* If there is already a security module registered with the kernel, * If there is already a security module registered with the kernel,
* an error will be returned. Otherwise %0 is returned on success. * an error will be returned. Otherwise %0 is returned on success.
*/ */
int register_security(struct security_operations *ops) int __init register_security(struct security_operations *ops)
{ {
if (verify(ops)) { if (verify(ops)) {
printk(KERN_DEBUG "%s could not verify " printk(KERN_DEBUG "%s could not verify "

2
security/selinux/hooks.c
View File

@ -323,7 +323,7 @@ extern int ss_initialized;
/* The file system's label must be initialized prior to use. */ /* The file system's label must be initialized prior to use. */
static char *labeling_behaviors[6] = { static const char *labeling_behaviors[6] = {
"uses xattr", "uses xattr",
"uses transition SIDs", "uses transition SIDs",
"uses task SIDs", "uses task SIDs",

2
security/selinux/include/initial_sid_to_string.h
View File

@ -1,5 +1,5 @@
/* This file is automatically generated. Do not edit. */ /* This file is automatically generated. Do not edit. */
static char *initial_sid_to_string[] = static const char *initial_sid_to_string[] =
{ {
"null", "null",
"kernel", "kernel",

1
security/selinux/netlink.c
View File

@ -13,7 +13,6 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/stddef.h> #include <linux/stddef.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/list.h>
#include <linux/skbuff.h> #include <linux/skbuff.h>
#include <linux/netlink.h> #include <linux/netlink.h>
#include <linux/selinux_netlink.h> #include <linux/selinux_netlink.h>

1
security/selinux/nlmsgtab.c
View File

@ -11,7 +11,6 @@
*/ */
#include <linux/types.h> #include <linux/types.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/skbuff.h>
#include <linux/netlink.h> #include <linux/netlink.h>
#include <linux/rtnetlink.h> #include <linux/rtnetlink.h>
#include <linux/if.h> #include <linux/if.h>

2
security/selinux/ss/policydb.c
View File

@ -40,7 +40,7 @@
#define _DEBUG_HASHES #define _DEBUG_HASHES
#ifdef DEBUG_HASHES #ifdef DEBUG_HASHES
static char *symtab_name[SYM_NUM] = { static const char *symtab_name[SYM_NUM] = {
"common prefixes", "common prefixes",
"classes", "classes",
"roles", "roles",

1
security/selinux/ss/symtab.c
View File

@ -4,7 +4,6 @@
* Author : Stephen Smalley, <sds@epoch.ncsc.mil> * Author : Stephen Smalley, <sds@epoch.ncsc.mil>
*/ */
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/slab.h>
#include <linux/string.h> #include <linux/string.h>
#include <linux/errno.h> #include <linux/errno.h>
#include "symtab.h" #include "symtab.h"

10
security/tomoyo/common.c
View File

@ -1367,7 +1367,6 @@ static bool tomoyo_print_path_acl(struct tomoyo_io_buffer *head,
{ {
int pos; int pos;
u8 bit; u8 bit;
const char *atmark = "";
const char *filename; const char *filename;
const u32 perm = ptr->perm | (((u32) ptr->perm_high) << 16); const u32 perm = ptr->perm | (((u32) ptr->perm_high) << 16);
@ -1382,8 +1381,7 @@ static bool tomoyo_print_path_acl(struct tomoyo_io_buffer *head,
continue; continue;
msg = tomoyo_path2keyword(bit); msg = tomoyo_path2keyword(bit);
pos = head->read_avail; pos = head->read_avail;
if (!tomoyo_io_printf(head, "allow_%s %s%s\n", msg, if (!tomoyo_io_printf(head, "allow_%s %s\n", msg, filename))
atmark, filename))
goto out; goto out;
} }
head->read_bit = 0; head->read_bit = 0;
@ -1406,8 +1404,6 @@ static bool tomoyo_print_path2_acl(struct tomoyo_io_buffer *head,
struct tomoyo_path2_acl *ptr) struct tomoyo_path2_acl *ptr)
{ {
int pos; int pos;
const char *atmark1 = "";
const char *atmark2 = "";
const char *filename1; const char *filename1;
const char *filename2; const char *filename2;
const u8 perm = ptr->perm; const u8 perm = ptr->perm;
@ -1421,8 +1417,8 @@ static bool tomoyo_print_path2_acl(struct tomoyo_io_buffer *head,
continue; continue;
msg = tomoyo_path22keyword(bit); msg = tomoyo_path22keyword(bit);
pos = head->read_avail; pos = head->read_avail;
if (!tomoyo_io_printf(head, "allow_%s %s%s %s%s\n", msg, if (!tomoyo_io_printf(head, "allow_%s %s %s\n", msg,
atmark1, filename1, atmark2, filename2)) filename1, filename2))
goto out; goto out;
} }
head->read_bit = 0; head->read_bit = 0;