git: 2a454b54bfbc - stable/13 - Fix the build after commit 5fa005e91560785dad5183db080209447afde3c2
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 16 Feb 2022 18:33:05 UTC
The branch stable/13 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=2a454b54bfbc831121657d89efa31066a1cc0e00
commit 2a454b54bfbc831121657d89efa31066a1cc0e00
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2022-02-16 18:32:18 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2022-02-16 18:32:18 +0000
Fix the build after commit 5fa005e91560785dad5183db080209447afde3c2
Fixes: 5fa005e91560 ("exec: Reimplement stack address randomization")
---
sys/arm64/linux/linux_sysvec.c | 3 +++
sys/kern/kern_exec.c | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/sys/arm64/linux/linux_sysvec.c b/sys/arm64/linux/linux_sysvec.c
index 3188d2f2c57c..6d05d7efa08c 100644
--- a/sys/arm64/linux/linux_sysvec.c
+++ b/sys/arm64/linux/linux_sysvec.c
@@ -45,7 +45,10 @@ __FBSDID("$FreeBSD$");
#include <sys/sysctl.h>
#include <sys/sysent.h>
+#include <vm/vm.h>
+#include <vm/pmap.h>
#include <vm/vm_param.h>
+#include <vm/vm_map.h>
#include <arm64/linux/linux.h>
#include <arm64/linux/linux_proto.h>
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index 49ab7d7b8d27..407c5ab3ed0e 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -1194,7 +1194,7 @@ exec_new_vmspace(struct image_params *imgp, struct sysentvec *sv)
}
}
- return (sv->sv_onexec != NULL ? sv->sv_onexec(p, imgp) : 0);
+ return (0);
}
/*