Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F177841860
D61809.1795410112.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Flag For Later
Award Token
Authored By
Unknown
Size
1 KB
Referenced Files
None
Subscribers
None
D61809.1795410112.diff
View Options
diff --git a/sys/kern/kern_kexec.c b/sys/kern/kern_kexec.c
--- a/sys/kern/kern_kexec.c
+++ b/sys/kern/kern_kexec.c
@@ -184,7 +184,8 @@
* - Install the new segments
*/
- if (nseg > KEXEC_SEGMENT_MAX)
+ /* No flags are implemented yet. */
+ if (nseg > KEXEC_SEGMENT_MAX || flags != 0)
return (EINVAL);
if (atomic_cmpset_acq_int(&kexec_loading, false, true) == 0)
diff --git a/tests/sys/kern/kexec_test.c b/tests/sys/kern/kexec_test.c
--- a/tests/sys/kern/kexec_test.c
+++ b/tests/sys/kern/kexec_test.c
@@ -278,6 +278,44 @@
ATF_REQUIRE(munmap(src, 2 * PAGE_SIZE) == 0);
}
+ATF_TC(kexec_bad_flags);
+ATF_TC_HEAD(kexec_bad_flags, tc)
+{
+ atf_tc_set_md_var(tc, "descr",
+ "nonzero flags are rejected");
+ atf_tc_set_md_var(tc, "require.user", "root");
+}
+ATF_TC_BODY(kexec_bad_flags, tc)
+{
+ struct kexec_segment seg;
+ vm_paddr_t target;
+ void *src;
+
+ require_kexec();
+
+ /* An unload does not reach the MD code, so this runs everywhere. */
+ ATF_REQUIRE_ERRNO(EINVAL,
+ kexec_load(0, 0, NULL, KEXEC_ON_CRASH) == -1);
+ ATF_REQUIRE_ERRNO(EINVAL, kexec_load(0, 0, NULL, 0x80) == -1);
+
+ target = find_target();
+ src = mmap(NULL, PAGE_SIZE, PROT_READ | PROT_WRITE,
+ MAP_ANON | MAP_PRIVATE, -1, 0);
+ ATF_REQUIRE(src != MAP_FAILED);
+ require_loadable(target, src);
+
+ memset(&seg, 0, sizeof(seg));
+ seg.buf = src;
+ seg.bufsz = PAGE_SIZE;
+ seg.mem = target;
+ seg.memsz = PAGE_SIZE;
+ ATF_REQUIRE_ERRNO(EINVAL,
+ kexec_load(target, 1, &seg, KEXEC_ON_CRASH) == -1);
+
+ ATF_REQUIRE(kexec_load(0, 0, NULL, 0) == 0);
+ ATF_REQUIRE(munmap(src, PAGE_SIZE) == 0);
+}
+
/* Large enough that the staging area needs more than a few page tables. */
#define BIG_SEGMENT (32 * 1024 * 1024)
@@ -438,6 +476,7 @@
ATF_TP_ADD_TCS(tp)
{
+ ATF_TP_ADD_TC(tp, kexec_bad_flags);
ATF_TP_ADD_TC(tp, kexec_bad_segment);
ATF_TP_ADD_TC(tp, kexec_copyin_fault);
ATF_TP_ADD_TC(tp, kexec_distant_segments);
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Mon, Nov 23, 5:01 AM (9 h, 22 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41902173
Default Alt Text
D61809.1795410112.diff (1 KB)
Attached To
Mode
D61809: kexec: reject nonzero flags
Attached
Detach File
Event Timeline