diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2015-07-12 18:11:12 -0500 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2015-08-26 15:23:39 +0200 |
| commit | 1c205b9cc6f66c5caa91fa2644dcf75254c3bfe1 (patch) | |
| tree | 3204b039f7ff57ce9ee6cc4a41cca8618bbed070 | |
| parent | 27d8d449ba7c553e9e004aaa07b225625b20fd2d (diff) | |
| download | linux-1c205b9cc6f66c5caa91fa2644dcf75254c3bfe1.tar.gz | |
MIPS: VPE: Exit vpe_release() early if vpe_run() isn't defined
vpe_run() is a weak symbol. If there's no definition of it, its value is zero. If vpe_run is zero, return failure early. We're going to fail anyway, so there's no point in getting a VPE and attempting to load it. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Cc: Andrew Bresticker <abrestic@chromium.org> Cc: linux-mips@linux-mips.org Cc: James Hogan <james.hogan@imgtec.com> Cc: linux-kernel@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/10683/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| -rw-r--r-- | arch/mips/kernel/vpe.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c index 11da314565cc..72cae9f55460 100644 --- a/arch/mips/kernel/vpe.c +++ b/arch/mips/kernel/vpe.c @@ -821,13 +821,18 @@ static int vpe_release(struct inode *inode, struct file *filp) Elf_Ehdr *hdr; int ret = 0; + if (!vpe_run) { + pr_warn("VPE loader: ELF load failed.\n"); + return -ENOEXEC; + } + v = get_vpe(aprp_cpu_index()); if (v == NULL) return -ENODEV; hdr = (Elf_Ehdr *) v->pbuffer; if (memcmp(hdr->e_ident, ELFMAG, SELFMAG) == 0) { - if ((vpe_elfload(v) >= 0) && vpe_run) { + if (vpe_elfload(v) >= 0) { vpe_run(v); } else { pr_warn("VPE loader: ELF load failed.\n"); |