security: apparmor: apparmorfs.c Checkpatch mods

cover

 security/apparmor/apparmorfs.c | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)
---
 security/apparmor/apparmorfs.c | 4 ----
 1 file changed, 4 deletions(-)
index 5923d56..62aac35 100644
@@ -112,7 +112,6 @@ static char *aa_simple_write_to_buffer(int op, const char __user *userbuf,
 	return data;
 }
 
-
 /* .load file hook fn to load policy */
 static ssize_t profile_load(struct file *f, const char __user *buf, size_t size,
 			    loff_t *pos)

@@ -552,7 +551,6 @@ int __aa_fs_namespace_mkdir(struct aa_namespace *ns, struct dentry *parent,
 	return error;
 }
 
-
 #define list_entry_is_head(pos, head, member) (&pos->member == (head))
 
 /**

@@ -687,7 +685,6 @@ static void *p_start(struct seq_file *f, loff_t *pos)
 	loff_t l = *pos;
 	f->private = aa_get_namespace(root);
 
-
 	/* find the first profile */
 	mutex_lock(&root->lock);
 	profile = __first_profile(root, root);

@@ -782,7 +779,6 @@ static const struct file_operations aa_fs_profiles_fops = {
 	.release = profiles_release,
 };
 
-
 /** Base file system setup **/
 static struct aa_fs_entry aa_fs_entry_file[] = {
 	AA_FS_FILE_STRING("mask", "create read write exec append mmap_exec " \

2.1.4
---
 security/apparmor/apparmorfs.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
index 62aac35..6b9ace3 100644
@@ -57,6 +57,7 @@ static int mangle_name(char *name, char *target)
 		*t = 0;
 	} else {
 		int len = 0;
+
 		for (; *name; name++) {
 			if (isalnum(*name) || isspace(*name) ||
 			    strchr("/._-", *name))

@@ -240,6 +241,7 @@ static int aa_fs_seq_profile_open(struct inode *inode, struct file *file,
 static int aa_fs_seq_profile_release(struct inode *inode, struct file *file)
 {
 	struct seq_file *seq = (struct seq_file *) file->private_data;
+
 	if (seq)
 		aa_put_replacedby(seq->private);
 	return single_release(inode, file);

@@ -249,6 +251,7 @@ static int aa_fs_seq_profname_show(struct seq_file *seq, void *v)
 {
 	struct aa_replacedby *r = seq->private;
 	struct aa_profile *profile = aa_get_profile_rcu(&r->profile);
+
 	seq_printf(seq, "%s\n", profile->base.name);
 	aa_put_profile(profile);
 

@@ -272,6 +275,7 @@ static int aa_fs_seq_profmode_show(struct seq_file *seq, void *v)
 {
 	struct aa_replacedby *r = seq->private;
 	struct aa_profile *profile = aa_get_profile_rcu(&r->profile);
+
 	seq_printf(seq, "%s\n", aa_profile_mode_names[profile->mode]);
 	aa_put_profile(profile);
 

@@ -295,6 +299,7 @@ static int aa_fs_seq_profattach_show(struct seq_file *seq, void *v)
 {
 	struct aa_replacedby *r = seq->private;
 	struct aa_profile *profile = aa_get_profile_rcu(&r->profile);
+
 	if (profile->attach)
 		seq_printf(seq, "%s\n", profile->attach);
 	else if (profile->xmatch)

@@ -362,6 +367,7 @@ void __aa_fs_profile_rmdir(struct aa_profile *profile)
 
 	for (i = AAFS_PROF_SIZEOF - 1; i >= 0; --i) {
 		struct aa_replacedby *r;
+
 		if (!profile->dents[i])
 			continue;
 

@@ -408,6 +414,7 @@ int __aa_fs_profile_mkdir(struct aa_profile *profile, struct dentry *parent)
 
 	if (!parent) {
 		struct aa_profile *p;
+
 		p = aa_deref_parent(profile);
 		dent = prof_dir(p);
 		/* adding to parent that previously didn't have children */

@@ -419,6 +426,7 @@ int __aa_fs_profile_mkdir(struct aa_profile *profile, struct dentry *parent)
 
 	if (!profile->dirname) {
 		int len, id_len;
+
 		len = mangle_name(profile->base.name, NULL);
 		id_len = snprintf(NULL, 0, ".%ld", profile->ns->uniq_id);
 

@@ -662,6 +670,7 @@ static struct aa_profile *next_profile(struct aa_namespace *root,
 				       struct aa_profile *profile)
 {
 	struct aa_profile *next = __next_profile(profile);
+
 	if (next)
 		return next;
 

@@ -683,6 +692,7 @@ static void *p_start(struct seq_file *f, loff_t *pos)
 	struct aa_profile *profile = NULL;
 	struct aa_namespace *root = aa_current_profile()->ns;
 	loff_t l = *pos;
+
 	f->private = aa_get_namespace(root);
 
 	/* find the first profile */

2.1.4
---
 security/apparmor/apparmorfs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
index 6b9ace3..c5701f3 100644
@@ -240,7 +240,7 @@ static int aa_fs_seq_profile_open(struct inode *inode, struct file *file,
 
 static int aa_fs_seq_profile_release(struct inode *inode, struct file *file)
 {
-	struct seq_file *seq = (struct seq_file *) file->private_data;
+	struct seq_file *seq = (struct seq_file *)file->private_data;
 
 	if (seq)
 		aa_put_replacedby(seq->private);

2.1.4
 security/apparmor/apparmorfs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
index c5701f3..d759c78 100644
@@ -87,7 +87,7 @@ static char *aa_simple_write_to_buffer(int op, const char __user *userbuf,
 {
 	char *data;
 
-	BUG_ON(copy_size > alloc_size);
+	WARN_ON(copy_size > alloc_size);
 
 	if (*pos != 0)
 		/* only writes from pos 0, that is complete writes */

2.1.4
 security/apparmor/apparmorfs.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
index d759c78..c8142cf 100644
@@ -647,8 +647,7 @@ static struct aa_profile *__next_profile(struct aa_profile *p)
 		if (!list_entry_is_head(p, &parent->base.profiles, base.list))
 			return p;
 		p = parent;
-		parent = rcu_dereference_protected(parent->parent,
-					    mutex_is_locked(&parent->ns->lock));
+		parent = rcu_dereference_protected(parent->parent, mutex_is_locked(&parent->ns->lock));
 	}
 
 	/* is next another profile in the namespace */

2.1.4
 security/apparmor/apparmorfs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
index c8142cf..c3fff95 100644
@@ -102,7 +102,7 @@ static char *aa_simple_write_to_buffer(int op, const char __user *userbuf,
 
 	/* freed by caller to simple_write_to_buffer */
 	data = kvmalloc(alloc_size);
-	if (data == NULL)
+	if (!data)
 		return ERR_PTR(-ENOMEM);
 
 	if (copy_from_user(data, userbuf, copy_size)) {

2.1.4
 security/apparmor/apparmorfs.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
index c3fff95..ee4f0d4 100644
@@ -790,8 +790,7 @@ static const struct file_operations aa_fs_profiles_fops = {
 
 /** Base file system setup **/
 static struct aa_fs_entry aa_fs_entry_file[] = {
-	AA_FS_FILE_STRING("mask", "create read write exec append mmap_exec " \
-				  "link lock"),
+	AA_FS_FILE_STRING("mask", "create read write exec append mmap_exec", " link lock"),
 	{ }
 };
 

2.1.4

security: apparmor: apparmorfs.c Checkpatch mods

Walt Feasel

Walt Feasel

Walt Feasel

Walt Feasel

Walt Feasel

Walt Feasel

Walt Feasel

Walt Feasel

Greg KH

Walt Feasel

Greg KH

Walt Feasel

Greg KH

Bjørn Mork

Joel Fernandes