[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20150712231112.11177.382.stgit@bhelgaas-glaptop2.roam.corp.google.com>
Date: Sun, 12 Jul 2015 18:11:12 -0500
From: Bjorn Helgaas <bhelgaas@...gle.com>
To: Ralf Baechle <ralf@...ux-mips.org>
Cc: Andrew Bresticker <abrestic@...omium.org>,
linux-mips@...ux-mips.org, James Hogan <james.hogan@...tec.com>,
linux-kernel@...r.kernel.org
Subject: [PATCH 3/9] 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@...gle.com>
---
arch/mips/kernel/vpe.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c
index 11da314..72cae9f 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");
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists