summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorHewenliang <hewenliang4@huawei.com>2019-11-12 05:16:55 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-01-26 12:01:07 +0300
commit83ff921a5e891a22e8b4ac1d0dfbb478de3691e8 (patch)
treedb26c6ace948b5540b65d52f6350fb82245da02c /tools
parentc570172d62413eddc9ac330449e84446ade384ad (diff)
downloadlinux-83ff921a5e891a22e8b4ac1d0dfbb478de3691e8.tar.xz
kselftests: cgroup: Avoid the reuse of fd after it is deallocated
[ Upstream commit d671fa6393d6788fc65555d4643b71cb3a361f36 ] It is necessary to set fd to -1 when inotify_add_watch() fails in cg_prepare_for_wait. Otherwise the fd which has been closed in cg_prepare_for_wait may be misused in other functions such as cg_enter_and_wait_for_frozen and cg_freeze_wait. Fixes: 5313bfe425c8 ("selftests: cgroup: add freezer controller self-tests") Signed-off-by: Hewenliang <hewenliang4@huawei.com> Signed-off-by: Tejun Heo <tj@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'tools')
-rw-r--r--tools/testing/selftests/cgroup/test_freezer.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/testing/selftests/cgroup/test_freezer.c b/tools/testing/selftests/cgroup/test_freezer.c
index 0fc1b6d4b0f9..62a27ab3c2f3 100644
--- a/tools/testing/selftests/cgroup/test_freezer.c
+++ b/tools/testing/selftests/cgroup/test_freezer.c
@@ -72,6 +72,7 @@ static int cg_prepare_for_wait(const char *cgroup)
if (ret == -1) {
debug("Error: inotify_add_watch() failed\n");
close(fd);
+ fd = -1;
}
return fd;