diff options
| author | Christophe JAILLET <[email protected]> | 2022-05-22 16:18:51 +0200 |
|---|---|---|
| committer | akpm <[email protected]> | 2022-05-25 10:47:46 -0700 |
| commit | 7fb6378701dc0d8f19c1ac4623b55f5125f0e286 (patch) | |
| tree | d656a551f8fa21aff4cb33e27893cda376384cb4 | |
| parent | 02e34fff195d3a5f67cbb553795dc109a37d1dcf (diff) | |
cgroup: fix an error handling path in alloc_pagecache_max_30M()
If the first goto is taken, 'fd' is not opened yet (and is un-initialized).
So a direct return is safer.
Link: https://lkml.kernel.org/r/628312312eb40e0e39463a2c06415fde5295c716.1653229120.git.christophe.jaillet@wanadoo.fr
Fixes: c1a31a2f7a9c ("cgroup: fix racy check in alloc_pagecache_max_30M() helper function")
Signed-off-by: Christophe JAILLET <[email protected]>
Reviewed-by: Andrew Morton <[email protected]>
Cc: Dan Carpenter <[email protected]>
Cc: Johannes Weiner <[email protected]>
Cc: Michal Hocko <[email protected]>
Cc: Roman Gushchin <[email protected]>
Cc: Shakeel Butt <[email protected]>
Cc: Muchun Song <[email protected]>
Cc: Tejun Heo <[email protected]>
Cc: Zefan Li <[email protected]>
Cc: Shuah Khan <[email protected]>
Cc: David Vernet <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
| -rw-r--r-- | tools/testing/selftests/cgroup/test_memcontrol.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/selftests/cgroup/test_memcontrol.c b/tools/testing/selftests/cgroup/test_memcontrol.c index 6ab94317c87b..44a974ec472c 100644 --- a/tools/testing/selftests/cgroup/test_memcontrol.c +++ b/tools/testing/selftests/cgroup/test_memcontrol.c @@ -574,7 +574,7 @@ static int alloc_pagecache_max_30M(const char *cgroup, void *arg) high = cg_read_long(cgroup, "memory.high"); max = cg_read_long(cgroup, "memory.max"); if (high != MB(30) && max != MB(30)) - goto cleanup; + return -1; fd = get_temp_fd(); if (fd < 0) |