File OPENSUSE-0004-cgroups-fix-Waddress-warning.patch of Package lxc

Overview Repositories Revisions Requests Users Attributes Meta

File OPENSUSE-0004-cgroups-fix-Waddress-warning.patch of Package lxc (Revision dcb52e0377f9fe3c8161bd094749980e)

Currently displaying revision dcb52e0377f9fe3c8161bd094749980e , Show latest

From 2a9743bba63903b66331b0b90fe2c25784585b89 Mon Sep 17 00:00:00 2001
From: Aleksa Sarai <cyphar@cyphar.com>
Date: Fri, 28 Oct 2022 12:27:57 +1100
Subject: [PATCH 4/7] cgroups: fix -Waddress warning
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

While in principle the pointer could overflow, GCC 12 considers this to
not be possible and issues the following warning:

../src/lxc/cgroups/cgfsng.c: In function ‘__cgfsng_delegate_controllers’:
  ../src/lxc/cgroups/cgfsng.c:3306:21: warning: the comparison will always evaluate as ‘true’ for the pointer operand in ‘it + 8’ must not be NULL [-Waddress]
   3306 |                 if ((it + 1) && *(it + 1))
        |                     ^

This removes the only build warning triggered when building on openSUSE.

Signed-off-by: Aleksa Sarai <cyphar@cyphar.com>
---
 src/lxc/cgroups/cgfsng.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c
index ee4fc052fd61..0c70095b1e1a 100644
--- a/src/lxc/cgroups/cgfsng.c
+++ b/src/lxc/cgroups/cgfsng.c
@@ -3302,7 +3302,7 @@ static bool __cgfsng_delegate_controllers(struct cgroup_ops *ops, const char *cg
 		(void)strlcat(add_controllers, "+", full_len + 1);
 		(void)strlcat(add_controllers, *it, full_len + 1);
 
-		if ((it + 1) && *(it + 1))
+		if (*(it + 1))
 			(void)strlcat(add_controllers, " ", full_len + 1);
 	}
 
@@ -3755,7 +3755,7 @@ static int __initialize_cgroups(struct cgroup_ops *ops, bool relative,
 	 * from the layout bitmask we created when parsing the cgroups.
 	 *
 	 * Keep the ordering in the switch otherwise the bistmask-based
-	 * matching won't work. 
+	 * matching won't work.
 	 */
 	if (ops->cgroup_layout == CGROUP_LAYOUT_UNKNOWN) {
 		switch (layout_mask) {
-- 
2.38.0

Places

File OPENSUSE-0004-cgroups-fix-Waddress-warning.patch of Package lxc (Revision dcb52e0377f9fe3c8161bd094749980e)

Places