Skip to content

Commit 36de5f3

Browse files
GustavoARSilvahtejun
authored andcommitted
cgroup: Avoid -Wstringop-overflow warnings
Address the following -Wstringop-overflow warnings seen when built with ARM architecture and aspeed_g4_defconfig configuration (notice that under this configuration CGROUP_SUBSYS_COUNT == 0): kernel/cgroup/cgroup.c:1208:16: warning: 'find_existing_css_set' accessing 4 bytes in a region of size 0 [-Wstringop-overflow=] kernel/cgroup/cgroup.c:1258:15: warning: 'css_set_hash' accessing 4 bytes in a region of size 0 [-Wstringop-overflow=] kernel/cgroup/cgroup.c:6089:18: warning: 'css_set_hash' accessing 4 bytes in a region of size 0 [-Wstringop-overflow=] kernel/cgroup/cgroup.c:6153:18: warning: 'css_set_hash' accessing 4 bytes in a region of size 0 [-Wstringop-overflow=] These changes are based on commit d20d30e ("cgroup: Avoid compiler warnings with no subsystems"). Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org> Reviewed-by: Kees Cook <keescook@chromium.org> Signed-off-by: Tejun Heo <tj@kernel.org>
1 parent a04de42 commit 36de5f3

1 file changed

Lines changed: 6 additions & 0 deletions

File tree

kernel/cgroup/cgroup.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1198,6 +1198,9 @@ static struct css_set *find_css_set(struct css_set *old_cset,
11981198
unsigned long key;
11991199
int ssid;
12001200

1201+
if (!CGROUP_HAS_SUBSYS_CONFIG)
1202+
return NULL;
1203+
12011204
lockdep_assert_held(&cgroup_mutex);
12021205

12031206
/* First see if we already have a cgroup group that matches
@@ -6017,6 +6020,9 @@ int __init cgroup_init(void)
60176020
struct cgroup_subsys *ss;
60186021
int ssid;
60196022

6023+
if (!CGROUP_HAS_SUBSYS_CONFIG)
6024+
return -EINVAL;
6025+
60206026
BUILD_BUG_ON(CGROUP_SUBSYS_COUNT > 16);
60216027
BUG_ON(cgroup_init_cftypes(NULL, cgroup_base_files));
60226028
BUG_ON(cgroup_init_cftypes(NULL, cgroup_psi_files));

0 commit comments

Comments
 (0)