From d952bc9966116ab5dba22d4a0c6d646e3b37235e Mon Sep 17 00:00:00 2001
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sun, 7 May 2017 13:43:50 +0200
Subject: [PATCH 02/65] apparmorfs: Combine two function calls into one in
aa_fs_seq_raw_abi_show()
References: FATE#323500
Patch-mainline: v4.13-rc1
Acked-by: Goldwyn Rodrigues <rgoldwyn@suse.com>
Git-commit: 0ff3d97f7676d9f513288a2d30582dcd2b34d238
A bit of data was put into a sequence by two separate function calls.
Print the same data by a single function call instead.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: John Johansen <john.johansen@canonical.com>
---
security/apparmor/apparmorfs.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c
index 4f6ac9dbc65d..b4d83e0bc651 100644
--- a/security/apparmor/apparmorfs.c
+++ b/security/apparmor/apparmorfs.c
@@ -572,10 +572,9 @@ static int aa_fs_seq_raw_abi_show(struct seq_file *seq, void *v)
struct aa_proxy *proxy = seq->private;
struct aa_profile *profile = aa_get_profile_rcu(&proxy->profile);
- if (profile->rawdata->abi) {
- seq_printf(seq, "v%d", profile->rawdata->abi);
- seq_puts(seq, "\n");
- }
+ if (profile->rawdata->abi)
+ seq_printf(seq, "v%d\n", profile->rawdata->abi);
+
aa_put_profile(profile);
return 0;
--
2.12.3