diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-11-02 10:57:24 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-11-02 10:57:24 +0100 |
| commit | 3357b0d3c7323d73806571192e9f633bb6ba3d54 (patch) | |
| tree | a92fb225bfdda901783ad662a1fea0baddfb81e1 /drivers/firmware/efi/test/efi_test.c | |
| parent | 82c62fa0c49aa305104013cee4468772799bb391 (diff) | |
| parent | e27c310af5c05cf876d9cad006928076c27f54d4 (diff) | |
| download | linux-3357b0d3c7323d73806571192e9f633bb6ba3d54.tar.gz linux-3357b0d3c7323d73806571192e9f633bb6ba3d54.tar.xz | |
Merge branch 'x86/mpx/prep' into x86/asm
Pick up some of the MPX commits that modify the syscall entry code,
to have a common base and to reduce conflicts.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/firmware/efi/test/efi_test.c')
| -rw-r--r-- | drivers/firmware/efi/test/efi_test.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/firmware/efi/test/efi_test.c b/drivers/firmware/efi/test/efi_test.c index 08129b7b80ab..41c48a1e8baa 100644 --- a/drivers/firmware/efi/test/efi_test.c +++ b/drivers/firmware/efi/test/efi_test.c @@ -593,6 +593,9 @@ static long efi_runtime_query_capsulecaps(unsigned long arg) if (copy_from_user(&qcaps, qcaps_user, sizeof(qcaps))) return -EFAULT; + if (qcaps.capsule_count == ULONG_MAX) + return -EINVAL; + capsules = kcalloc(qcaps.capsule_count + 1, sizeof(efi_capsule_header_t), GFP_KERNEL); if (!capsules) |