Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc46d4e4 authored by Kees Cook's avatar Kees Cook
Browse files

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: default avatarKees Cook <keescook@chromium.org>
parent 70ad35db

fs/pstore/ram.c

+11 −2
Original line number Diff line number Diff line
@@ -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)) {