Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
L
lxc
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
lxc
Commits
530c5e19
Commit
530c5e19
authored
Jan 06, 2016
by
Serge Hallyn
Committed by
Stéphane Graber
Nov 17, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
apparmor: recognize 'unconfined' as unconfined.
Signed-off-by:
Serge Hallyn
<
serge.hallyn@ubuntu.com
>
parent
4c17a8a6
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
apparmor.c
src/lxc/lsm/apparmor.c
+3
-2
No files found.
src/lxc/lsm/apparmor.c
View file @
530c5e19
...
...
@@ -132,8 +132,10 @@ static bool aa_stacking_supported(void) {
static
bool
in_aa_confined_container
(
void
)
{
char
*
p
=
apparmor_process_label_get
(
getpid
());
bool
ret
=
false
;
if
(
p
&&
strcmp
(
p
,
"/usr/bin/lxc-start"
)
!=
0
)
if
(
p
&&
strcmp
(
p
,
"/usr/bin/lxc-start"
)
!=
0
&&
strcmp
(
p
,
"unconfined"
)
!=
0
)
{
INFO
(
"Already apparmor-confined under %s"
,
p
);
ret
=
true
;
}
free
(
p
);
return
ret
;
}
...
...
@@ -170,7 +172,6 @@ static int apparmor_process_label_set(const char *label, int use_default,
ERROR
(
"already apparmor confined, but new label requested."
);
return
-
1
;
}
INFO
(
"Already apparmor-confined"
);
return
0
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment