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
24d1ef2b
Unverified
Commit
24d1ef2b
authored
Apr 12, 2021
by
Christian Brauner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
conf: simplify idmaptool_on_path_and_privileged()
Signed-off-by:
Christian Brauner
<
christian.brauner@ubuntu.com
>
parent
933acfaa
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
6 deletions
+5
-6
conf.c
src/lxc/conf.c
+5
-6
No files found.
src/lxc/conf.c
View file @
24d1ef2b
...
...
@@ -2789,18 +2789,16 @@ static int idmaptool_on_path_and_privileged(const char *binary, cap_value_t cap)
int
ret
;
struct
stat
st
;
errno
=
EINVAL
;
if
(
cap
!=
CAP_SETUID
&&
cap
!=
CAP_SETGID
)
return
-
1
;
return
ret_errno
(
EINVAL
)
;
errno
=
ENOENT
;
path
=
on_path
(
binary
,
NULL
);
if
(
!
path
)
return
-
1
;
return
ret_errno
(
ENOENT
)
;
ret
=
stat
(
path
,
&
st
);
if
(
ret
<
0
)
return
-
1
;
return
-
errno
;
/* Check if the binary is setuid. */
if
(
st
.
st_mode
&
S_ISUID
)
...
...
@@ -2819,7 +2817,8 @@ static int idmaptool_on_path_and_privileged(const char *binary, cap_value_t cap)
lxc_file_cap_is_set
(
path
,
CAP_SETGID
,
CAP_PERMITTED
))
return
log_debug
(
1
,
"The binary
\"
%s
\"
has CAP_SETGID in its CAP_EFFECTIVE and CAP_PERMITTED sets"
,
path
);
#else
/* If we cannot check for file capabilities we need to give the benefit
/*
* If we cannot check for file capabilities we need to give the benefit
* of the doubt. Otherwise we might fail even though all the necessary
* file capabilities are set.
*/
...
...
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