From 164fb659e30346c7140bdda2bf9b47e59bdcebe9 Mon Sep 17 00:00:00 2001 From: wangmeiyang Date: Wed, 23 Nov 2022 10:28:49 +0800 Subject: [PATCH 01/23] vircgroupv1: fix null string specifier argument in virCgroupV1ValidatePlacement MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Detected by gcc 11 -Wformat-overflow: ../../src/util/vircgroupv1.c: In function ‘virCgroupV1ValidatePlacement’: ../../src/util/virerror.h:176:5: warning: ‘%s’ directive argument is null [-Wformat-overflow=] 176 | virReportErrorHelper(VIR_FROM_THIS, code, __FILE__, \ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 177 | __FUNCTION__, __LINE__, __VA_ARGS__) | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../../src/util/vircgroupv1.c:411:13: note: in expansion of macro ‘virReportError’ 411 | virReportError(VIR_ERR_INTERNAL_ERROR, | ^~~~~~~~~~~~~~ ../../src/util/vircgroupv1.c:412:80: note: format string is defined here 412 | _("Could not find placement for v1 controller %s at %s"), | ^~ cherry-pick from 8833b42f3b092c1b401109ddf174ea1dbb1eb8c6 Signed-off-by: Scott Davis Signed-off-by: Meiyang Wang Reviewed-by: Ján Tomko --- src/util/vircgroupv1.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c index 5504441fa6..f5a96bd736 100644 --- a/src/util/vircgroupv1.c +++ b/src/util/vircgroupv1.c @@ -376,9 +376,8 @@ virCgroupV1ValidatePlacement(virCgroupPtr group, if (!group->legacy[i].placement) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not find placement for v1 controller %s at %s"), - virCgroupV1ControllerTypeToString(i), - group->legacy[i].placement); + _("Could not find placement for v1 controller %s"), + virCgroupV1ControllerTypeToString(i)); return -1; } -- 2.27.0