[lxc/lxc] f3c398: criu: fix error message

0 views
Skip to first unread message

Christian Brauner

unread,
Oct 19, 2021, 11:25:30 AMOct 19
to lxc-...@lists.linuxcontainers.org
Branch: refs/heads/stable-4.0
Home: https://github.com/lxc/lxc
Commit: f3c3987bb2039ae5723a56ed6bd0b7b4f9781ded
https://github.com/lxc/lxc/commit/f3c3987bb2039ae5723a56ed6bd0b7b4f9781ded
Author: Tycho Andersen <ty...@tycho.pizza>
Date: 2021-10-19 (Tue, 19 Oct 2021)

Changed paths:
M src/lxc/criu.c

Log Message:
-----------
criu: fix error message

as of 59d8a539d106 ("criu: massage exec_criu()") I see:

In file included from criu.c:22:
criu.c: In function 'exec_criu':
log.h:376:2: error: '%s' directive argument is null [-Werror=format-overflow=]
376 | LXC_ERROR(&locinfo, format, ##__VA_ARGS__); \
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
log.h:457:3: note: in expansion of macro 'ERROR'
457 | ERROR("%s - " format, ptr, ##__VA_ARGS__); \
| ^~~~~
log.h:491:3: note: in expansion of macro 'SYSERROR'
491 | SYSERROR(format, ##__VA_ARGS__); \
| ^~~~~~~~
criu.c:325:11: note: in expansion of macro 'log_error_errno'
325 | return log_error_errno(-ENOMEM, ENOMEM, "Failed to remove extraneous slashes from \"%s\"", tmp);
| ^~~~~~~~~~~~~~~

it looks like we should be logging the string that failed, vs. tmp here.

(my log was taken from stable-4.0, but the same issue exists on master it
seems.)

Signed-off-by: Tycho Andersen <ty...@tycho.pizza>


Commit: 5f5144e1ce5cc43c99d0be834e59bbe7d83ae4cb
https://github.com/lxc/lxc/commit/5f5144e1ce5cc43c99d0be834e59bbe7d83ae4cb
Author: Christian Brauner <christia...@ubuntu.com>
Date: 2021-10-19 (Tue, 19 Oct 2021)

Changed paths:
M src/lxc/af_unix.c

Log Message:
-----------
af_unix: replace log_error_errno()

Signed-off-by: Christian Brauner <christia...@ubuntu.com>


Commit: bc004c21f1f0bb8571609f8a7446fda2619de79a
https://github.com/lxc/lxc/commit/bc004c21f1f0bb8571609f8a7446fda2619de79a
Author: Christian Brauner <christia...@ubuntu.com>
Date: 2021-10-19 (Tue, 19 Oct 2021)

Changed paths:
M src/lxc/attach.c

Log Message:
-----------
attach: improve error logging

Signed-off-by: Christian Brauner <christia...@ubuntu.com>


Commit: 33186c054f6faf8b2c5a5062385533dc8f851c15
https://github.com/lxc/lxc/commit/33186c054f6faf8b2c5a5062385533dc8f851c15
Author: Christian Brauner <christia...@ubuntu.com>
Date: 2021-10-19 (Tue, 19 Oct 2021)

Changed paths:
M src/lxc/caps.c
M src/lxc/file_utils.h

Log Message:
-----------
caps: ensure \0-termination

Fixes: Coverity 1492865
Signed-off-by: Christian Brauner <christia...@ubuntu.com>


Commit: 4c95b15d832125e2cd903df90169563ed3c5daf3
https://github.com/lxc/lxc/commit/4c95b15d832125e2cd903df90169563ed3c5daf3
Author: Christian Brauner <christia...@ubuntu.com>
Date: 2021-10-19 (Tue, 19 Oct 2021)

Changed paths:
M src/lxc/conf.c

Log Message:
-----------
conf: fix coding style

Signed-off-by: Christian Brauner <christia...@ubuntu.com>


Commit: 8f5f3daa24858ce06369951af79bf4e85d5ece01
https://github.com/lxc/lxc/commit/8f5f3daa24858ce06369951af79bf4e85d5ece01
Author: Christian Brauner <christia...@ubuntu.com>
Date: 2021-10-19 (Tue, 19 Oct 2021)

Changed paths:
M src/lxc/conf.c

Log Message:
-----------
conf: don't fail umount2()

Signed-off-by: Christian Brauner <christia...@ubuntu.com>


Commit: 0f892901b25300e7d602e8f0df80e5ab27b8fc64
https://github.com/lxc/lxc/commit/0f892901b25300e7d602e8f0df80e5ab27b8fc64
Author: Heinrich Schuchardt <heinrich....@canonical.com>
Date: 2021-10-19 (Tue, 19 Oct 2021)

Changed paths:
M config/bash/lxc.in
M src/lxc/confile.c
M src/tests/arch_parse.c

Log Message:
-----------
Add riscv64 to --arch parameter values

lxc-attach uses an --arch parameter. 'riscv64' should be a usable value.

Signed-off-by: Heinrich Schuchardt <heinrich....@canonical.com>


Commit: edc2d1c7769269f057fb1baf1b23a09698372fe2
https://github.com/lxc/lxc/commit/edc2d1c7769269f057fb1baf1b23a09698372fe2
Author: Heinrich Schuchardt <heinrich....@canonical.com>
Date: 2021-10-19 (Tue, 19 Oct 2021)

Changed paths:
M README.md

Log Message:
-----------
README.md: mention RISC-V architecture

Signed-off-by: Heinrich Schuchardt <heinrich....@canonical.com>


Commit: 42283e2275e3a72b8da5276ab3266f89f3b79855
https://github.com/lxc/lxc/commit/42283e2275e3a72b8da5276ab3266f89f3b79855
Author: Christian Brauner <christia...@ubuntu.com>
Date: 2021-10-19 (Tue, 19 Oct 2021)

Changed paths:
M src/lxc/conf.c

Log Message:
-----------
conf: verify that rootfs is stable after setting up mounts

Apparently some users changed their rootfs via their lxc.mount.entry
entries. Let's not allow that as that can cause confusion during
container setup. So lets verify that the rootfs is stable after setup.

Signed-off-by: Christian Brauner <christia...@ubuntu.com>


Compare: https://github.com/lxc/lxc/compare/5ac772d63214...42283e2275e3
Reply all
Reply to author
Forward
0 new messages