mirror of
https://gitlab.com/apparmor/apparmor.git
synced 2025-03-04 00:14:44 +01:00
6260deec9a
The old out of tree patchseries has been completely dropped. v4.13 has most of the newer apparmor 3.x code in it. v4.14 has the rest except the af_unix mediation which is included as the last patch
29 lines
1 KiB
Diff
29 lines
1 KiB
Diff
From 4b56e146905bbad2c79ea92e3f49e210ca527572 Mon Sep 17 00:00:00 2001
|
|
From: John Johansen <john.johansen@canonical.com>
|
|
Date: Mon, 31 Jul 2017 23:44:37 -0700
|
|
Subject: [PATCH 05/17] apparmor: Redundant condition: prev_ns. in
|
|
[label.c:1498]
|
|
|
|
Reported-by: David Binderman <dcb314@hotmail.com>
|
|
Signed-off-by: John Johansen <john.johansen@canonical.com>
|
|
(cherry picked from commit d323d2c17cfcc54b6845bfc1d13bca5cef210fc7)
|
|
---
|
|
security/apparmor/label.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/security/apparmor/label.c b/security/apparmor/label.c
|
|
index e052eaba1cf6..e324f4df3e34 100644
|
|
--- a/security/apparmor/label.c
|
|
+++ b/security/apparmor/label.c
|
|
@@ -1495,7 +1495,7 @@ static int aa_profile_snxprint(char *str, size_t size, struct aa_ns *view,
|
|
view = profiles_ns(profile);
|
|
|
|
if (view != profile->ns &&
|
|
- (!prev_ns || (prev_ns && *prev_ns != profile->ns))) {
|
|
+ (!prev_ns || (*prev_ns != profile->ns))) {
|
|
if (prev_ns)
|
|
*prev_ns = profile->ns;
|
|
ns_name = aa_ns_name(view, profile->ns,
|
|
--
|
|
2.11.0
|
|
|