diff options
| author | Lennart Poettering <lennart@poettering.net> | 2019-11-01 10:21:35 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2019-11-01 10:21:35 +0100 |
| commit | 85c3b2789115a9e814326b869224ed3d16dbd170 (patch) | |
| tree | 1425ded5d5e47ea6e15a7c24b43c8056c81b866c | |
| parent | 6878c02245b49987749e73a12003fcf07bf173ca (diff) | |
| download | systemd-85c3b2789115a9e814326b869224ed3d16dbd170.tar.gz | |
cgroup: add some basic OOM safety where it was missing
| -rw-r--r-- | src/core/cgroup.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/core/cgroup.c b/src/core/cgroup.c index 981aca53cd..95ebafa10d 100644 --- a/src/core/cgroup.c +++ b/src/core/cgroup.c @@ -360,9 +360,7 @@ static char *format_cgroup_memory_limit_comparison(char *buf, size_t l, Unit *u, } void cgroup_context_dump(Unit *u, FILE* f, const char *prefix) { - _cleanup_free_ char *disable_controllers_str = NULL; - _cleanup_free_ char *cpuset_cpus = NULL; - _cleanup_free_ char *cpuset_mems = NULL; + _cleanup_free_ char *disable_controllers_str = NULL, *cpuset_cpus = NULL, *cpuset_mems = NULL; CGroupIODeviceLimit *il; CGroupIODeviceWeight *iw; CGroupIODeviceLatency *l; @@ -437,8 +435,8 @@ void cgroup_context_dump(Unit *u, FILE* f, const char *prefix) { prefix, c->startup_cpu_shares, prefix, format_timespan(q, sizeof(q), c->cpu_quota_per_sec_usec, 1), prefix, format_timespan(v, sizeof(v), c->cpu_quota_period_usec, 1), - prefix, cpuset_cpus, - prefix, cpuset_mems, + prefix, strempty(cpuset_cpus), + prefix, strempty(cpuset_mems), prefix, c->io_weight, prefix, c->startup_io_weight, prefix, c->blockio_weight, |