| From c38c432f1a42dd147063a47174ff13bf6a8a194a Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 20 Sep 2023 14:36:10 +0200 |
| Subject: kernel: kexec: copy user-array safely |
| |
| From: Philipp Stanner <pstanner@redhat.com> |
| |
| [ Upstream commit 569c8d82f95eb5993c84fb61a649a9c4ddd208b3 ] |
| |
| Currently, there is no overflow-check with memdup_user(). |
| |
| Use the new function memdup_array_user() instead of memdup_user() for |
| duplicating the user-space array safely. |
| |
| Suggested-by: David Airlie <airlied@redhat.com> |
| Signed-off-by: Philipp Stanner <pstanner@redhat.com> |
| Acked-by: Baoquan He <bhe@redhat.com> |
| Reviewed-by: Kees Cook <keescook@chromium.org> |
| Reviewed-by: Zack Rusin <zackr@vmware.com> |
| Signed-off-by: Dave Airlie <airlied@redhat.com> |
| Link: https://patchwork.freedesktop.org/patch/msgid/20230920123612.16914-4-pstanner@redhat.com |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| kernel/kexec.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/kernel/kexec.c b/kernel/kexec.c |
| index cb8e6e6f983c7..5ff1dcc4acb78 100644 |
| --- a/kernel/kexec.c |
| +++ b/kernel/kexec.c |
| @@ -240,7 +240,7 @@ SYSCALL_DEFINE4(kexec_load, unsigned long, entry, unsigned long, nr_segments, |
| ((flags & KEXEC_ARCH_MASK) != KEXEC_ARCH_DEFAULT)) |
| return -EINVAL; |
| |
| - ksegments = memdup_user(segments, nr_segments * sizeof(ksegments[0])); |
| + ksegments = memdup_array_user(segments, nr_segments, sizeof(ksegments[0])); |
| if (IS_ERR(ksegments)) |
| return PTR_ERR(ksegments); |
| |
| -- |
| 2.42.0 |
| |
