From: Kees Cook <keescook@chromium.org>
Date: Wed, 16 Nov 2016 00:29:40 +0000 (-0800)
Subject: ramoops: add pdata NULL check to ramoops_probe
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=fc46d4e453f50d2b376267f180cae250b54f9fb4;p=linux-beck.git

ramoops: add pdata NULL check to ramoops_probe

This adds a check for a NULL platform data, which should only be possible
if a driver incorrectly sets up a probe request without also having defined
the platform_data structure. This is based on a patch from Geliang Tang.

Signed-off-by: Kees Cook <keescook@chromium.org>
---

diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c
index 380222432eff..27c059e1760a 100644
--- a/fs/pstore/ram.c
+++ b/fs/pstore/ram.c
@@ -734,11 +734,20 @@ static int ramoops_probe(struct platform_device *pdev)
 			goto fail_out;
 	}
 
-	/* Only a single ramoops area allowed at a time, so fail extra
+	/*
+	 * Only a single ramoops area allowed at a time, so fail extra
 	 * probes.
 	 */
-	if (cxt->max_dump_cnt)
+	if (cxt->max_dump_cnt) {
+		pr_err("already initialized\n");
 		goto fail_out;
+	}
+
+	/* Make sure we didn't get bogus platform data pointer. */
+	if (!pdata) {
+		pr_err("NULL platform data\n");
+		goto fail_out;
+	}
 
 	if (!pdata->mem_size || (!pdata->record_size && !pdata->console_size &&
 			!pdata->ftrace_size && !pdata->pmsg_size)) {