[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 4/4] linux-user: Check copy_from_user() return value in vma_dump_s
From: |
Laurent Vivier |
Subject: |
[PULL 4/4] linux-user: Check copy_from_user() return value in vma_dump_size() |
Date: |
Thu, 5 Nov 2020 08:08:37 +0100 |
From: Peter Maydell <peter.maydell@linaro.org>
Coverity points out that we don't check the return value from
copy_from_user() in vma_dump_size(). This is to some extent
a "can't happen" error since we've already checked the page
with an access_ok() call earlier, but it's simple enough to
handle the error anyway.
Fixes: Coverity CID 1432362
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20201103141532.19912-1-peter.maydell@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
linux-user/elfload.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index cae41d504d36..0b02a926025e 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -3485,7 +3485,9 @@ static abi_ulong vma_dump_size(const struct
vm_area_struct *vma)
if (vma->vma_flags & PROT_EXEC) {
char page[TARGET_PAGE_SIZE];
- copy_from_user(page, vma->vma_start, sizeof (page));
+ if (copy_from_user(page, vma->vma_start, sizeof (page))) {
+ return 0;
+ }
if ((page[EI_MAG0] == ELFMAG0) &&
(page[EI_MAG1] == ELFMAG1) &&
(page[EI_MAG2] == ELFMAG2) &&
--
2.28.0
- [PULL 0/4] Linux user for 5.2 patches, Laurent Vivier, 2020/11/05
- [PULL 2/4] linux-user: Use "!= 0" when checking if MAP_FIXED_NOREPLACE is non-zero, Laurent Vivier, 2020/11/05
- [PULL 4/4] linux-user: Check copy_from_user() return value in vma_dump_size(),
Laurent Vivier <=
- [PULL 3/4] linux-user/syscall: Fix missing target_to_host_timespec64() check, Laurent Vivier, 2020/11/05
- [PULL 1/4] linux-user/mips/cpu_loop: silence the compiler warnings, Laurent Vivier, 2020/11/05
- Re: [PULL 0/4] Linux user for 5.2 patches, no-reply, 2020/11/05
- Re: [PULL 0/4] Linux user for 5.2 patches, Peter Maydell, 2020/11/06