Home Home > GIT Browse

Tools

Branches

openSUSE

Upstream

SLE

SLE AddOns

Other

summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2009-09-08 09:49:15 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2009-09-08 09:49:15 -0700
commita9eb883d64602b6462005eb758d6778724fdf018 (patch)
tree214d1feced02879cd5e134f0732a698e35c937be
parent3b234fdc3a8a343ef91d2eff9677a8415a85e3c6 (diff)
- refresh patches for fuzz due to upstream changesrpm-2.6.31-7--openSUSE-11.2-Milestone7rpm-2.6.31-7
suse-commit: 3161ffc424838f7e32e6d64970eef2ff8f016cd1
Diffstat
-rw-r--r--arch/x86/kernel/reboot.c2
-rw-r--r--security/apparmor/domain.c10
-rw-r--r--security/apparmor/include/file.h2
-rw-r--r--security/apparmor/include/policy.h4
-rw-r--r--security/apparmor/lsm.c12
-rw-r--r--security/apparmor/net.c2
-rw-r--r--security/apparmor/policy.c14
-rw-r--r--security/apparmor/policy_interface.c2
-rw-r--r--security/apparmor/sid.c4
9 files changed, 26 insertions, 26 deletions
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index e5e509dbbf96..f92f7a240341 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -716,7 +716,7 @@ void halt_current_cpu(struct pt_regs *regs)
{
#ifdef CONFIG_X86_32
struct pt_regs fixed_regs;
-#endif
+#endif
local_irq_disable();
#ifdef CONFIG_X86_32
if (!user_mode_vm(regs)) {
diff --git a/security/apparmor/domain.c b/security/apparmor/domain.c
index f4febd91f7a1..af8b132d409a 100644
--- a/security/apparmor/domain.c
+++ b/security/apparmor/domain.c
@@ -224,7 +224,7 @@ int apparmor_bprm_set_creds(struct linux_binprm *bprm)
unsigned int state = DFA_START;
struct aa_audit_file sa;
struct path_cond cond = { bprm->file->f_path.dentry->d_inode->i_uid,
- bprm->file->f_path.dentry->d_inode->i_mode };
+ bprm->file->f_path.dentry->d_inode->i_mode };
sa.base.error = cap_bprm_set_creds(bprm);
if (sa.base.error)
@@ -374,7 +374,7 @@ int apparmor_bprm_secureexec(struct linux_binprm *bprm)
/* the decision to use secure exec is computed in set_creds
* and stored in bprm->unsafe. The AppArmor X_UNSAFE flag is
- * indicates don't
+ * indicates don't
*/
if (!ret && (bprm->unsafe & AA_SECURE_X_NEEDED))
ret = 1;
@@ -430,7 +430,7 @@ static void revalidate_file(struct aa_profile *profile, struct file *file,
}
}
-/*
+/*
* derived from security/selinux/hooks.c: flush_unauthorized_files &&
* fs/exec.c:flush_old_files
*/
@@ -470,7 +470,7 @@ static int revalidate_files(struct aa_profile *profile,
}
spin_lock(&files->file_lock);
}
- spin_unlock(&files->file_lock);
+ spin_unlock(&files->file_lock);
kfree(buffer);
return 0;
}
@@ -677,7 +677,7 @@ int aa_change_profile(const char *ns_name, const char *fqname, int onexec,
goto audit;
target = aa_alloc_null_profile(profile, 0);
}
-
+
/* check if tracing task is allowed to trace target domain */
sa.base.error = aa_may_change_ptraced_domain(current, target);
if (sa.base.error) {
diff --git a/security/apparmor/include/file.h b/security/apparmor/include/file.h
index cd3bdaa2e06f..14c0dfee2814 100644
--- a/security/apparmor/include/file.h
+++ b/security/apparmor/include/file.h
@@ -54,7 +54,7 @@ struct aa_profile;
#define AA_X_INDEX_MASK 0x03ff
#define AA_X_TYPE_MASK 0x0c00
-#define AA_X_TYPE_SHIFT 10
+#define AA_X_TYPE_SHIFT 10
#define AA_X_NONE 0x0000
#define AA_X_NAME 0x0400 /* use executable name px */
#define AA_X_TABLE 0x0800 /* use a specified name ->n# */
diff --git a/security/apparmor/include/policy.h b/security/apparmor/include/policy.h
index b0a03cdb7cd6..de26f9a10dea 100644
--- a/security/apparmor/include/policy.h
+++ b/security/apparmor/include/policy.h
@@ -189,7 +189,7 @@ extern rwlock_t ns_list_lock;
extern struct aa_namespace *default_namespace;
extern enum profile_mode g_profile_mode;
-
+
void aa_add_profile(struct aa_policy_common *common,
struct aa_profile *profile);
@@ -201,7 +201,7 @@ void free_aa_namespace_kref(struct kref *kref);
void free_aa_namespace(struct aa_namespace *ns);
struct aa_namespace *__aa_find_namespace(struct list_head *head,
const char *name);
-
+
struct aa_namespace *aa_find_namespace(const char *name);
struct aa_namespace *aa_prepare_namespace(const char *name);
void aa_remove_namespace(struct aa_namespace *ns);
diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
index f071328161dc..6c228ac5eec0 100644
--- a/security/apparmor/lsm.c
+++ b/security/apparmor/lsm.c
@@ -138,7 +138,7 @@ static int apparmor_sysctl(struct ctl_table *table, int op)
if (!buffer)
goto out;
- /*
+ /*
* TODO: convert this over to using a global or per
* namespace control instead of a hard coded /proc
*/
@@ -171,7 +171,7 @@ static int common_perm(const char *op, struct path *path, u16 mask,
}
static int common_perm_dentry(const char *op, struct path *dir,
- struct dentry *dentry, u16 mask,
+ struct dentry *dentry, u16 mask,
struct path_cond *cond)
{
struct path path = { dir->mnt, dentry };
@@ -281,7 +281,7 @@ static int apparmor_path_rename(struct path *old_dir, struct dentry *old_dentry,
if (!error)
error = aa_path_perm(profile, "rename_dest", &new_path,
AA_MAY_CREATE | MAY_WRITE, &cond);
-
+
}
return error;
}
@@ -290,7 +290,7 @@ static int apparmor_dentry_open(struct file *file, const struct cred *cred)
{
struct aa_profile *profile;
int error = 0;
-
+
/* If in exec permission is handled by bprm hooks */
if (current->in_execve ||
!mediated_filesystem(file->f_path.dentry->d_inode))
@@ -299,7 +299,7 @@ static int apparmor_dentry_open(struct file *file, const struct cred *cred)
aa_cred_policy(cred, &profile);
if (profile) {
struct aa_file_cxt *fcxt = file->f_security;
- struct inode *inode = file->f_path.dentry->d_inode;
+ struct inode *inode = file->f_path.dentry->d_inode;
struct path_cond cond = { inode->i_uid, inode->i_mode };
error = aa_path_perm(profile, "open", &file->f_path,
@@ -391,7 +391,7 @@ static int apparmor_file_lock(struct file *file, unsigned int cmd)
/*
* AppArmor doesn't current use the fcntl hook.
- *
+ *
* FIXME - these are not implemented yet - REMOVE file_fcntl hook
* NOTE: some of the file control commands are further mediated
* by other hooks
diff --git a/security/apparmor/net.c b/security/apparmor/net.c
index e1aed92f16dd..010bb3b4d214 100644
--- a/security/apparmor/net.c
+++ b/security/apparmor/net.c
@@ -62,7 +62,7 @@ static void audit_cb(struct audit_buffer *ab, void *va)
audit_log_format(ab, " protocol=%d", sa->protocol);
}
-
+
}
static int aa_audit_net(struct aa_profile *profile, struct aa_audit_net *sa)
diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c
index 873071cdcf78..e7b0b61cac9a 100644
--- a/security/apparmor/policy.c
+++ b/security/apparmor/policy.c
@@ -105,7 +105,7 @@ static void common_free(struct aa_policy_common *common)
static struct aa_policy_common *__common_find(struct list_head *head,
const char *name)
-
+
{
struct aa_policy_common *common;
@@ -228,7 +228,7 @@ void free_aa_namespace(struct aa_namespace *ns)
struct aa_namespace *__aa_find_namespace(struct list_head *head,
const char *name)
-
+
{
return (struct aa_namespace *) __common_find(head, name);
}
@@ -276,7 +276,7 @@ struct aa_namespace *aa_find_namespace_by_strn(const char *name, int len)
struct aa_namespace *aa_prepare_namespace(const char *name)
{
struct aa_namespace *ns;
-
+
write_lock(&ns_list_lock);
if (name)
ns = aa_get_namespace(__aa_find_namespace(&ns_list, name));
@@ -417,12 +417,12 @@ struct aa_profile *alloc_aa_profile(const char *fqname)
profile = kzalloc(sizeof(*profile), GFP_KERNEL);
if (!profile)
return NULL;
-
+
if (!common_init(&profile->base, fqname)) {
kfree(profile);
return NULL;
}
-
+
profile->fqname = profile->base.name;
profile->base.name = (char *) fqname_subname((const char *) profile->fqname);
return profile;
@@ -593,7 +593,7 @@ struct aa_policy_common *__aa_find_parent_by_fqname(struct aa_namespace *ns,
common = &ns->base;
-
+
for (split = strstr(fqname, "//"); split; ) {
profile = __aa_find_profile_by_strn(&common->profiles, fqname,
split - fqname);
@@ -721,7 +721,7 @@ struct aa_profile *aa_profile_newest(struct aa_profile *profile)
profile = NULL;
break;
}
- }
+ }
}
return profile;
diff --git a/security/apparmor/policy_interface.c b/security/apparmor/policy_interface.c
index cdd745d12240..420509769c24 100644
--- a/security/apparmor/policy_interface.c
+++ b/security/apparmor/policy_interface.c
@@ -713,7 +713,7 @@ ssize_t aa_interface_replace_profiles(void *udata, size_t size)
sa.base.info = "failed to prepare namespace";
sa.base.error = -ENOMEM;
goto fail;
- }
+ }
sa.name = new_profile->fqname;
diff --git a/security/apparmor/sid.c b/security/apparmor/sid.c
index aa41a351f6b0..f2c0ce7dd53d 100644
--- a/security/apparmor/sid.c
+++ b/security/apparmor/sid.c
@@ -50,13 +50,13 @@ u32 aa_alloc_sid(int is_usr)
{
u32 sid;
- /*
+ /*
* TODO FIXME: sid recycling - part of profile mapping table
*/
spin_lock(&sid_lock);
if (is_usr) {
sid = (++global_usr_sid) << 16;
-
+
} else {
sid = ++global_sys_sid;
}