aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2018-09-11 12:39:25 +0200
committerDmitry Vyukov <dvyukov@google.com>2018-09-11 12:39:25 +0200
commite3d1d545d390055ca67987d27243e0d2b37feedd (patch)
tree42c2ee714540651d36a3387d7f9f2f6e84b32cbe
parenta171414b74df01e0978ef1495ccf7c6d901b84cd (diff)
executor: reset oom_score_adj for test process
oom_score_adj is inherited, so we need to reset it to 0.
-rw-r--r--executor/common_linux.h4
-rw-r--r--pkg/csource/generated.go3
2 files changed, 7 insertions, 0 deletions
diff --git a/executor/common_linux.h b/executor/common_linux.h
index 21433c515..2f5692105 100644
--- a/executor/common_linux.h
+++ b/executor/common_linux.h
@@ -2067,6 +2067,10 @@ static void setup_test()
if (symlink(cgroupdir, "./cgroup.net")) {
debug("symlink(%s, ./cgroup.net) failed: %d\n", cgroupdir, errno);
}
+ // Reset oom_score_adj since it's inherited from parent.
+ if (!write_file("/proc/self/oom_score_adj", "0")) {
+ debug("write(oom_score_adj) failed: %d\n", errno);
+ }
#endif
#if SYZ_EXECUTOR || SYZ_TUN_ENABLE
// Read all remaining packets from tun to better
diff --git a/pkg/csource/generated.go b/pkg/csource/generated.go
index 0e254d5d9..7b5d05f63 100644
--- a/pkg/csource/generated.go
+++ b/pkg/csource/generated.go
@@ -3552,6 +3552,9 @@ static void setup_test()
if (symlink(cgroupdir, "./cgroup.net")) {
debug("symlink(%s, ./cgroup.net) failed: %d\n", cgroupdir, errno);
}
+ if (!write_file("/proc/self/oom_score_adj", "0")) {
+ debug("write(oom_score_adj) failed: %d\n", errno);
+ }
#endif
#if SYZ_EXECUTOR || SYZ_TUN_ENABLE
flush_tun();