From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 28 Nov 2023 04:02:02 +0000 (+0900)
Subject: core/cgroup: fix compile error
X-Git-Tag: v255-rc4~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14338cca996b3d2c361d679d5859389305ddc5b3;p=thirdparty%2Fsystemd.git

core/cgroup: fix compile error

With gcc-13,
```
CFLAGS="-O3 -fno-semantic-interposition" meson setup build
```
triggers the following error:
```
../src/core/cgroup.c: In function ‘cgroup_context_dump’:
../src/core/cgroup.c:633:44: error: ‘%s’ directive argument is null [-Werror=format-overflow=]
  633 |                         "%sDeviceAllow: %s %s\n",
      |                                            ^~
cc1: some warnings being treated as errors
```

Fixes #30223.
---

diff --git a/src/core/cgroup.c b/src/core/cgroup.c
index 10678dc669b..e1bf90d62c6 100644
--- a/src/core/cgroup.c
+++ b/src/core/cgroup.c
@@ -629,11 +629,12 @@ void cgroup_context_dump(Unit *u, FILE* f, const char *prefix) {
                         prefix, FORMAT_TIMESPAN(c->memory_pressure_threshold_usec, 1));
 
         LIST_FOREACH(device_allow, a, c->device_allow)
+                /* strna() below should be redundant, for avoiding -Werror=format-overflow= error. See #30223. */
                 fprintf(f,
                         "%sDeviceAllow: %s %s\n",
                         prefix,
                         a->path,
-                        cgroup_device_permissions_to_string(a->permissions));
+                        strna(cgroup_device_permissions_to_string(a->permissions)));
 
         LIST_FOREACH(device_weights, iw, c->io_device_weights)
                 fprintf(f,