From: Andre Przywara <andre.przywara@arm.com> To: will.deacon@arm.com, kvm@vger.kernel.org Cc: marc.zyngier@arm.com, kvmarm@lists.cs.columbia.edu, kvm-ppc@vger.kernel.org Subject: [PATCH 13/14] MIPS: use read wrappers in kernel loading Date: Thu, 30 Jul 2015 11:52:30 +0100 [thread overview] Message-ID: <1438253551-2378-14-git-send-email-andre.przywara@arm.com> (raw) In-Reply-To: <1438253551-2378-1-git-send-email-andre.przywara@arm.com> Replace the unsafe read-loops used in the MIPS kernel image loading with our safe read_file() and read_in_full() wrappers. This should fix random fails in kernel image loading, especially from pipes and sockets. Signed-off-by: Andre Przywara <andre.przywara@arm.com> --- mips/kvm.c | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/mips/kvm.c b/mips/kvm.c index d970ee0..2f0d61b 100644 --- a/mips/kvm.c +++ b/mips/kvm.c @@ -169,21 +169,27 @@ static bool load_flat_binary(struct kvm *kvm, int fd_kernel, const void *buf, { void *p; void *k_start; - int nr; + ssize_t kernel_size; p = k_start = guest_flat_to_host(kvm, KERNEL_LOAD_ADDR); memcpy(p, buf, buflen); p += buflen; - while ((nr = read(fd_kernel, p, 65536)) > 0) - p += nr; + kernel_size = read_file(fd_kernel, p, + kvm->cfg.ram_size - KERNEL_LOAD_ADDR); + if (kernel_size == -1) { + if (errno == ENOMEM) + die("kernel too big for guest memory"); + else + die_perror("kernel read"); + } kvm->arch.is64bit = true; kvm->arch.entry_point = 0xffffffff81000000ull; - pr_info("Loaded kernel to 0x%x (%ld bytes)", KERNEL_LOAD_ADDR, - (long int)(p - k_start)); + pr_info("Loaded kernel to 0x%x (%zd bytes)", KERNEL_LOAD_ADDR, + kernel_size); return true; } @@ -199,7 +205,6 @@ static bool kvm__arch_get_elf_64_info(Elf64_Ehdr *ehdr, int fd_kernel, struct kvm__arch_elf_info *ei) { int i; - size_t nr; Elf64_Phdr phdr; if (ehdr->e_phentsize != sizeof(phdr)) { @@ -214,8 +219,7 @@ static bool kvm__arch_get_elf_64_info(Elf64_Ehdr *ehdr, int fd_kernel, phdr.p_type = PT_NULL; for (i = 0; i < ehdr->e_phnum; i++) { - nr = read(fd_kernel, &phdr, sizeof(phdr)); - if (nr != sizeof(phdr)) { + if (read_in_full(fd_kernel, &phdr, sizeof(phdr)) != sizeof(phdr)) { pr_info("Couldn't read %d bytes for ELF PHDR.", (int)sizeof(phdr)); return false; } @@ -245,7 +249,6 @@ static bool kvm__arch_get_elf_32_info(Elf32_Ehdr *ehdr, int fd_kernel, struct kvm__arch_elf_info *ei) { int i; - size_t nr; Elf32_Phdr phdr; if (ehdr->e_phentsize != sizeof(phdr)) { @@ -260,8 +263,7 @@ static bool kvm__arch_get_elf_32_info(Elf32_Ehdr *ehdr, int fd_kernel, phdr.p_type = PT_NULL; for (i = 0; i < ehdr->e_phnum; i++) { - nr = read(fd_kernel, &phdr, sizeof(phdr)); - if (nr != sizeof(phdr)) { + if (read_in_full(fd_kernel, &phdr, sizeof(phdr)) != sizeof(phdr)) { pr_info("Couldn't read %d bytes for ELF PHDR.", (int)sizeof(phdr)); return false; } @@ -292,7 +294,6 @@ union ElfHeaders { static bool load_elf_binary(struct kvm *kvm, int fd_kernel, union ElfHeaders *eh) { - size_t nr; char *p; struct kvm__arch_elf_info ei; @@ -331,13 +332,9 @@ static bool load_elf_binary(struct kvm *kvm, int fd_kernel, pr_info("ELF Loading 0x%lx bytes from 0x%llx to 0x%llx", (unsigned long)ei.len, (unsigned long long)ei.offset, (unsigned long long)ei.load_addr); - do { - nr = read(fd_kernel, p, ei.len); - if (nr < 0) - die_perror("read"); - p += nr; - ei.len -= nr; - } while (ei.len); + + if (read_in_full(fd_kernel, p, ei.len) != (ssize_t)ei.len) + die_perror("read"); return true; } -- 2.3.5
WARNING: multiple messages have this Message-ID (diff)
From: Andre Przywara <andre.przywara@arm.com> To: will.deacon@arm.com, kvm@vger.kernel.org Cc: marc.zyngier@arm.com, kvmarm@lists.cs.columbia.edu, kvm-ppc@vger.kernel.org Subject: [PATCH 13/14] MIPS: use read wrappers in kernel loading Date: Thu, 30 Jul 2015 10:52:30 +0000 [thread overview] Message-ID: <1438253551-2378-14-git-send-email-andre.przywara@arm.com> (raw) In-Reply-To: <1438253551-2378-1-git-send-email-andre.przywara@arm.com> Replace the unsafe read-loops used in the MIPS kernel image loading with our safe read_file() and read_in_full() wrappers. This should fix random fails in kernel image loading, especially from pipes and sockets. Signed-off-by: Andre Przywara <andre.przywara@arm.com> --- mips/kvm.c | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/mips/kvm.c b/mips/kvm.c index d970ee0..2f0d61b 100644 --- a/mips/kvm.c +++ b/mips/kvm.c @@ -169,21 +169,27 @@ static bool load_flat_binary(struct kvm *kvm, int fd_kernel, const void *buf, { void *p; void *k_start; - int nr; + ssize_t kernel_size; p = k_start = guest_flat_to_host(kvm, KERNEL_LOAD_ADDR); memcpy(p, buf, buflen); p += buflen; - while ((nr = read(fd_kernel, p, 65536)) > 0) - p += nr; + kernel_size = read_file(fd_kernel, p, + kvm->cfg.ram_size - KERNEL_LOAD_ADDR); + if (kernel_size = -1) { + if (errno = ENOMEM) + die("kernel too big for guest memory"); + else + die_perror("kernel read"); + } kvm->arch.is64bit = true; kvm->arch.entry_point = 0xffffffff81000000ull; - pr_info("Loaded kernel to 0x%x (%ld bytes)", KERNEL_LOAD_ADDR, - (long int)(p - k_start)); + pr_info("Loaded kernel to 0x%x (%zd bytes)", KERNEL_LOAD_ADDR, + kernel_size); return true; } @@ -199,7 +205,6 @@ static bool kvm__arch_get_elf_64_info(Elf64_Ehdr *ehdr, int fd_kernel, struct kvm__arch_elf_info *ei) { int i; - size_t nr; Elf64_Phdr phdr; if (ehdr->e_phentsize != sizeof(phdr)) { @@ -214,8 +219,7 @@ static bool kvm__arch_get_elf_64_info(Elf64_Ehdr *ehdr, int fd_kernel, phdr.p_type = PT_NULL; for (i = 0; i < ehdr->e_phnum; i++) { - nr = read(fd_kernel, &phdr, sizeof(phdr)); - if (nr != sizeof(phdr)) { + if (read_in_full(fd_kernel, &phdr, sizeof(phdr)) != sizeof(phdr)) { pr_info("Couldn't read %d bytes for ELF PHDR.", (int)sizeof(phdr)); return false; } @@ -245,7 +249,6 @@ static bool kvm__arch_get_elf_32_info(Elf32_Ehdr *ehdr, int fd_kernel, struct kvm__arch_elf_info *ei) { int i; - size_t nr; Elf32_Phdr phdr; if (ehdr->e_phentsize != sizeof(phdr)) { @@ -260,8 +263,7 @@ static bool kvm__arch_get_elf_32_info(Elf32_Ehdr *ehdr, int fd_kernel, phdr.p_type = PT_NULL; for (i = 0; i < ehdr->e_phnum; i++) { - nr = read(fd_kernel, &phdr, sizeof(phdr)); - if (nr != sizeof(phdr)) { + if (read_in_full(fd_kernel, &phdr, sizeof(phdr)) != sizeof(phdr)) { pr_info("Couldn't read %d bytes for ELF PHDR.", (int)sizeof(phdr)); return false; } @@ -292,7 +294,6 @@ union ElfHeaders { static bool load_elf_binary(struct kvm *kvm, int fd_kernel, union ElfHeaders *eh) { - size_t nr; char *p; struct kvm__arch_elf_info ei; @@ -331,13 +332,9 @@ static bool load_elf_binary(struct kvm *kvm, int fd_kernel, pr_info("ELF Loading 0x%lx bytes from 0x%llx to 0x%llx", (unsigned long)ei.len, (unsigned long long)ei.offset, (unsigned long long)ei.load_addr); - do { - nr = read(fd_kernel, p, ei.len); - if (nr < 0) - die_perror("read"); - p += nr; - ei.len -= nr; - } while (ei.len); + + if (read_in_full(fd_kernel, p, ei.len) != (ssize_t)ei.len) + die_perror("read"); return true; } -- 2.3.5
next prev parent reply other threads:[~2015-07-30 10:52 UTC|newest] Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-07-30 10:52 [PATCH 00/14] kvmtool: Refactor kernel image loading to allow pipes Andre Przywara 2015-07-30 10:52 ` Andre Przywara 2015-07-30 10:52 ` [PATCH 01/14] Refactor kernel image loading Andre Przywara 2015-07-30 10:52 ` Andre Przywara 2015-07-30 10:52 ` [PATCH 02/14] arm/powerpc: remove unneeded seeks in kernel loading Andre Przywara 2015-07-30 10:52 ` Andre Przywara 2015-07-30 10:52 ` [PATCH 03/14] x86: allow pipes for bzImage kernel images Andre Przywara 2015-07-30 10:52 ` Andre Przywara 2015-07-30 10:52 ` [PATCH 04/14] x86: support loading flat binary kernel images from a pipe Andre Przywara 2015-07-30 10:52 ` Andre Przywara 2015-07-30 10:52 ` [PATCH 05/14] kvmtool: introduce pseek Andre Przywara 2015-07-30 10:52 ` Andre Przywara 2015-07-30 10:52 ` [PATCH 06/14] MIPS: use pseek() in ELF kernel image loading Andre Przywara 2015-07-30 10:52 ` Andre Przywara 2015-07-30 10:52 ` [PATCH 07/14] MIPS: move ELF headers loading outside of load_elf_binary() Andre Przywara 2015-07-30 10:52 ` Andre Przywara 2015-07-30 10:52 ` [PATCH 08/14] MIPS: remove seeks from load_flat_binary() Andre Przywara 2015-07-30 10:52 ` Andre Przywara 2015-07-30 10:52 ` [PATCH 09/14] arm: move kernel loading into arm/kvm.c Andre Przywara 2015-07-30 10:52 ` Andre Przywara 2015-07-30 10:52 ` [PATCH 10/14] provide generic read_file() implementation Andre Przywara 2015-07-30 10:52 ` Andre Przywara 2015-07-30 10:52 ` [PATCH 11/14] arm/arm64: use read_file() in kernel and initrd loading Andre Przywara 2015-07-30 10:52 ` Andre Przywara 2015-07-30 10:52 ` [PATCH 12/14] powerpc: " Andre Przywara 2015-07-30 10:52 ` Andre Przywara 2015-07-30 10:52 ` Andre Przywara [this message] 2015-07-30 10:52 ` [PATCH 13/14] MIPS: use read wrappers in kernel loading Andre Przywara 2015-07-30 10:52 ` [PATCH 14/14] x86: " Andre Przywara 2015-07-30 10:52 ` Andre Przywara
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1438253551-2378-14-git-send-email-andre.przywara@arm.com \ --to=andre.przywara@arm.com \ --cc=kvm-ppc@vger.kernel.org \ --cc=kvm@vger.kernel.org \ --cc=kvmarm@lists.cs.columbia.edu \ --cc=marc.zyngier@arm.com \ --cc=will.deacon@arm.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.