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
0a48ee66
Unverified
Commit
0a48ee66
authored
Feb 15, 2021
by
Christian Brauner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
confile: forbid walking upwards for confile items that modify cgroup layout
Signed-off-by:
Christian Brauner
<
christian.brauner@ubuntu.com
>
parent
7d714159
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
1 deletion
+25
-1
confile.c
src/lxc/confile.c
+12
-1
log.h
src/lxc/log.h
+8
-0
string_utils.h
src/lxc/string_utils.h
+5
-0
No files found.
src/lxc/confile.c
View file @
0a48ee66
...
...
@@ -1815,7 +1815,6 @@ static int set_config_cgroup2_controller(const char *key, const char *value,
CGROUP2_SUPER_MAGIC
);
}
static
int
set_config_cgroup_dir
(
const
char
*
key
,
const
char
*
value
,
struct
lxc_conf
*
lxc_conf
,
void
*
data
)
{
...
...
@@ -1825,6 +1824,9 @@ static int set_config_cgroup_dir(const char *key, const char *value,
if
(
lxc_config_value_empty
(
value
))
return
clr_config_cgroup_dir
(
key
,
lxc_conf
,
NULL
);
if
(
dotdot
(
value
))
return
syserrno_set
(
-
EINVAL
,
"%s paths may not walk upwards via
\"
../
\"
"
,
key
);
return
set_config_path_item
(
&
lxc_conf
->
cgroup_meta
.
dir
,
value
);
}
...
...
@@ -1834,6 +1836,9 @@ static int set_config_cgroup_monitor_dir(const char *key, const char *value,
if
(
lxc_config_value_empty
(
value
))
return
clr_config_cgroup_monitor_dir
(
key
,
lxc_conf
,
NULL
);
if
(
dotdot
(
value
))
return
syserrno_set
(
-
EINVAL
,
"%s paths may not walk upwards via
\"
../
\"
"
,
key
);
return
set_config_path_item
(
&
lxc_conf
->
cgroup_meta
.
monitor_dir
,
value
);
}
...
...
@@ -1843,6 +1848,9 @@ static int set_config_cgroup_monitor_pivot_dir(const char *key, const char *valu
if
(
lxc_config_value_empty
(
value
))
return
clr_config_cgroup_monitor_pivot_dir
(
key
,
lxc_conf
,
NULL
);
if
(
dotdot
(
value
))
return
syserrno_set
(
-
EINVAL
,
"%s paths may not walk upwards via
\"
../
\"
"
,
key
);
return
set_config_path_item
(
&
lxc_conf
->
cgroup_meta
.
monitor_pivot_dir
,
value
);
}
...
...
@@ -1853,6 +1861,9 @@ static int set_config_cgroup_container_dir(const char *key, const char *value,
if
(
lxc_config_value_empty
(
value
))
return
clr_config_cgroup_container_dir
(
key
,
lxc_conf
,
NULL
);
if
(
dotdot
(
value
))
return
syserrno_set
(
-
EINVAL
,
"%s paths may not walk upwards via
\"
../
\"
"
,
key
);
return
set_config_path_item
(
&
lxc_conf
->
cgroup_meta
.
container_dir
,
value
);
}
...
...
src/lxc/log.h
View file @
0a48ee66
...
...
@@ -501,6 +501,14 @@ __lxc_unused static inline void LXC_##LEVEL(struct lxc_log_locinfo* locinfo, \
__internal_ret__; \
})
#define syserrno_set(__ret__, format, ...) \
({ \
typeof(__ret__) __internal_ret__ = (__ret__); \
errno = abs(__ret__); \
SYSERROR(format, ##__VA_ARGS__); \
__internal_ret__; \
})
#define log_error(__ret__, format, ...) \
({ \
typeof(__ret__) __internal_ret__ = (__ret__); \
...
...
src/lxc/string_utils.h
View file @
0a48ee66
...
...
@@ -140,6 +140,11 @@ static inline bool strequal(const char *str, const char *eq)
return
strcmp
(
str
,
eq
)
==
0
;
}
static
inline
bool
dotdot
(
const
char
*
str
)
{
return
!!
strstr
(
str
,
".."
);
}
#define strnprintf(buf, buf_size, ...) \
({ \
int __ret_strnprintf; \
...
...
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