aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Morehouse <mascasa@google.com>2020-06-05 19:29:05 +0000
committerDmitry Vyukov <dvyukov@google.com>2020-06-06 07:49:50 +0200
commite6b89e4e5adde15c0dc0a241e03dc215f2e249b3 (patch)
tree4c86fd0dd97e291eb8cde4dec11e11c4cdea426e
parentc3e9afb345d6b479ca401f18ceba6f7ae43e45ab (diff)
sys/linux: add MREMAP_DONTUNMAP flag
Update https://github.com/google/syzkaller/issues/533.
-rw-r--r--sys/linux/bpf_386.const2
-rw-r--r--sys/linux/bpf_amd64.const2
-rw-r--r--sys/linux/bpf_arm.const2
-rw-r--r--sys/linux/bpf_arm64.const2
-rw-r--r--sys/linux/bpf_mips64le.const2
-rw-r--r--sys/linux/bpf_ppc64le.const2
-rw-r--r--sys/linux/sys.txt2
-rw-r--r--sys/linux/sys_386.const1
-rw-r--r--sys/linux/sys_amd64.const1
-rw-r--r--sys/linux/sys_arm.const1
-rw-r--r--sys/linux/sys_arm64.const1
-rw-r--r--sys/linux/sys_mips64le.const1
-rw-r--r--sys/linux/sys_ppc64le.const1
13 files changed, 13 insertions, 7 deletions
diff --git a/sys/linux/bpf_386.const b/sys/linux/bpf_386.const
index ef795c02e..a7b9cea50 100644
--- a/sys/linux/bpf_386.const
+++ b/sys/linux/bpf_386.const
@@ -217,7 +217,7 @@ BTF_KIND_VOLATILE = 9
BTF_MAGIC = 60319
BTF_VERSION = 1
MAX_BPF_REG = 11
-__BPF_FUNC_MAX_ID = 130
+__BPF_FUNC_MAX_ID = 136
__MAX_BPF_REG = 11
__NR_bpf = 357
bpf_call_code = 133
diff --git a/sys/linux/bpf_amd64.const b/sys/linux/bpf_amd64.const
index 483f88928..d2dda67d2 100644
--- a/sys/linux/bpf_amd64.const
+++ b/sys/linux/bpf_amd64.const
@@ -217,7 +217,7 @@ BTF_KIND_VOLATILE = 9
BTF_MAGIC = 60319
BTF_VERSION = 1
MAX_BPF_REG = 11
-__BPF_FUNC_MAX_ID = 130
+__BPF_FUNC_MAX_ID = 136
__MAX_BPF_REG = 11
__NR_bpf = 321
bpf_call_code = 133
diff --git a/sys/linux/bpf_arm.const b/sys/linux/bpf_arm.const
index 6bf9f30a5..9ca4f606c 100644
--- a/sys/linux/bpf_arm.const
+++ b/sys/linux/bpf_arm.const
@@ -217,7 +217,7 @@ BTF_KIND_VOLATILE = 9
BTF_MAGIC = 60319
BTF_VERSION = 1
MAX_BPF_REG = 11
-__BPF_FUNC_MAX_ID = 130
+__BPF_FUNC_MAX_ID = 136
__MAX_BPF_REG = 11
__NR_bpf = 386
bpf_call_code = 133
diff --git a/sys/linux/bpf_arm64.const b/sys/linux/bpf_arm64.const
index 851f2ef2d..811e510c7 100644
--- a/sys/linux/bpf_arm64.const
+++ b/sys/linux/bpf_arm64.const
@@ -217,7 +217,7 @@ BTF_KIND_VOLATILE = 9
BTF_MAGIC = 60319
BTF_VERSION = 1
MAX_BPF_REG = 11
-__BPF_FUNC_MAX_ID = 130
+__BPF_FUNC_MAX_ID = 136
__MAX_BPF_REG = 11
__NR_bpf = 280
bpf_call_code = 133
diff --git a/sys/linux/bpf_mips64le.const b/sys/linux/bpf_mips64le.const
index b72f33fab..0648b1ce0 100644
--- a/sys/linux/bpf_mips64le.const
+++ b/sys/linux/bpf_mips64le.const
@@ -217,7 +217,7 @@ BTF_KIND_VOLATILE = 9
BTF_MAGIC = 60319
BTF_VERSION = 1
MAX_BPF_REG = 11
-__BPF_FUNC_MAX_ID = 130
+__BPF_FUNC_MAX_ID = 136
__MAX_BPF_REG = 11
__NR_bpf = 5315
bpf_call_code = 133
diff --git a/sys/linux/bpf_ppc64le.const b/sys/linux/bpf_ppc64le.const
index 5417f9010..d45d7ca4b 100644
--- a/sys/linux/bpf_ppc64le.const
+++ b/sys/linux/bpf_ppc64le.const
@@ -217,7 +217,7 @@ BTF_KIND_VOLATILE = 9
BTF_MAGIC = 60319
BTF_VERSION = 1
MAX_BPF_REG = 11
-__BPF_FUNC_MAX_ID = 130
+__BPF_FUNC_MAX_ID = 136
__MAX_BPF_REG = 11
__NR_bpf = 361
bpf_call_code = 133
diff --git a/sys/linux/sys.txt b/sys/linux/sys.txt
index 1986d0554..93ae625dc 100644
--- a/sys/linux/sys.txt
+++ b/sys/linux/sys.txt
@@ -895,7 +895,7 @@ move_pages_flags = MPOL_MF_MOVE, MPOL_MF_MOVE_ALL
msync_flags = MS_ASYNC, MS_SYNC, MS_INVALIDATE
mmap_prot = PROT_EXEC, PROT_READ, PROT_WRITE, PROT_SEM, PROT_GROWSDOWN, PROT_GROWSUP
mmap_flags = MAP_SHARED, MAP_PRIVATE, MAP_32BIT, MAP_ANONYMOUS, MAP_DENYWRITE, MAP_EXECUTABLE, MAP_FILE, MAP_FIXED, MAP_GROWSDOWN, MAP_HUGETLB, MAP_LOCKED, MAP_NONBLOCK, MAP_NORESERVE, MAP_POPULATE, MAP_STACK, MAP_UNINITIALIZED, MAP_SHARED_VALIDATE, MAP_SYNC, MAP_FIXED_NOREPLACE
-mremap_flags = MREMAP_MAYMOVE, MREMAP_FIXED
+mremap_flags = MREMAP_MAYMOVE, MREMAP_FIXED, MREMAP_DONTUNMAP
mbind_mode = MPOL_DEFAULT, MPOL_BIND, MPOL_INTERLEAVE, MPOL_PREFERRED, MPOL_F_STATIC_NODES, MPOL_F_RELATIVE_NODES
mbind_flags = MPOL_MF_STRICT, MPOL_MF_MOVE, MPOL_MF_MOVE_ALL
pipe_flags = O_NONBLOCK, O_CLOEXEC, O_DIRECT
diff --git a/sys/linux/sys_386.const b/sys/linux/sys_386.const
index 17528a402..2b5a54e1f 100644
--- a/sys/linux/sys_386.const
+++ b/sys/linux/sys_386.const
@@ -264,6 +264,7 @@ MPOL_MF_MOVE = 2
MPOL_MF_MOVE_ALL = 4
MPOL_MF_STRICT = 1
MPOL_PREFERRED = 1
+MREMAP_DONTUNMAP = 4
MREMAP_FIXED = 2
MREMAP_MAYMOVE = 1
MS_ASYNC = 1
diff --git a/sys/linux/sys_amd64.const b/sys/linux/sys_amd64.const
index 4b0804ffa..f66b32056 100644
--- a/sys/linux/sys_amd64.const
+++ b/sys/linux/sys_amd64.const
@@ -264,6 +264,7 @@ MPOL_MF_MOVE = 2
MPOL_MF_MOVE_ALL = 4
MPOL_MF_STRICT = 1
MPOL_PREFERRED = 1
+MREMAP_DONTUNMAP = 4
MREMAP_FIXED = 2
MREMAP_MAYMOVE = 1
MS_ASYNC = 1
diff --git a/sys/linux/sys_arm.const b/sys/linux/sys_arm.const
index f260c688d..dac0aa65e 100644
--- a/sys/linux/sys_arm.const
+++ b/sys/linux/sys_arm.const
@@ -264,6 +264,7 @@ MPOL_MF_MOVE = 2
MPOL_MF_MOVE_ALL = 4
MPOL_MF_STRICT = 1
MPOL_PREFERRED = 1
+MREMAP_DONTUNMAP = 4
MREMAP_FIXED = 2
MREMAP_MAYMOVE = 1
MS_ASYNC = 1
diff --git a/sys/linux/sys_arm64.const b/sys/linux/sys_arm64.const
index ece09cb76..c5cc1c97c 100644
--- a/sys/linux/sys_arm64.const
+++ b/sys/linux/sys_arm64.const
@@ -264,6 +264,7 @@ MPOL_MF_MOVE = 2
MPOL_MF_MOVE_ALL = 4
MPOL_MF_STRICT = 1
MPOL_PREFERRED = 1
+MREMAP_DONTUNMAP = 4
MREMAP_FIXED = 2
MREMAP_MAYMOVE = 1
MS_ASYNC = 1
diff --git a/sys/linux/sys_mips64le.const b/sys/linux/sys_mips64le.const
index fb7c403c9..bbb5f0379 100644
--- a/sys/linux/sys_mips64le.const
+++ b/sys/linux/sys_mips64le.const
@@ -264,6 +264,7 @@ MPOL_MF_MOVE = 2
MPOL_MF_MOVE_ALL = 4
MPOL_MF_STRICT = 1
MPOL_PREFERRED = 1
+MREMAP_DONTUNMAP = 4
MREMAP_FIXED = 2
MREMAP_MAYMOVE = 1
MS_ASYNC = 1
diff --git a/sys/linux/sys_ppc64le.const b/sys/linux/sys_ppc64le.const
index c5b32f309..af43719c4 100644
--- a/sys/linux/sys_ppc64le.const
+++ b/sys/linux/sys_ppc64le.const
@@ -264,6 +264,7 @@ MPOL_MF_MOVE = 2
MPOL_MF_MOVE_ALL = 4
MPOL_MF_STRICT = 1
MPOL_PREFERRED = 1
+MREMAP_DONTUNMAP = 4
MREMAP_FIXED = 2
MREMAP_MAYMOVE = 1
MS_ASYNC = 1