[PATCH 2/7] security: apparmor: apparmorfs.c Blank line after declarations
Walt Feasel
waltfeasel at gmail.com
Sat Nov 26 03:43:20 EST 2016
Make style modifications for:
WARNING: Missing a blank line after declarations
Signed-off-by: Walt Feasel <waltfeasel at gmail.com>
---
security/apparmor/apparmorfs.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c
index 62aac35..6b9ace3 100644
--- a/security/apparmor/apparmorfs.c
+++ b/security/apparmor/apparmorfs.c
@@ -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
More information about the Kernelnewbies
mailing list