ramoops: update parameters only after successful init (c755201e) · Commits · 戴 / test

If a platform device exists on the system, but ramoops fails to attach to it, the module parameters are overridden before ramoops can fall back and try to use passed module parameters. Move update to end of init routine. Signed-off-by:

Kees Cook <keescook@chromium.org> Cc: Marco Stornelli <marco.stornelli@gmail.com> Cc: Sergiu Iordache <sergiu@chromium.org> Cc: Seiji Aguchi <seiji.aguchi@hds.com> Signed-off-by:

Andrew Morton <akpm@linux-foundation.org> Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

drivers/char/ramoops.c

+9 −8

Original line number	Diff line number	Diff line
		@@ -147,14 +147,6 @@ static int __init ramoops_probe(struct platform_device *pdev)
		cxt->phys_addr = pdata->mem_address;
		cxt->record_size = pdata->record_size;
		cxt->dump_oops = pdata->dump_oops;
		/*
		* Update the module parameter variables as well so they are visible
		* through /sys/module/ramoops/parameters/
		*/
		mem_size = pdata->mem_size;
		mem_address = pdata->mem_address;
		record_size = pdata->record_size;
		dump_oops = pdata->dump_oops;

		if (!request_mem_region(cxt->phys_addr, cxt->size, "ramoops")) {
		pr_err("request mem region failed\n");
		@@ -175,6 +167,15 @@ static int __init ramoops_probe(struct platform_device *pdev)
		goto fail1;
		}

		/*
		* Update the module parameter variables as well so they are visible
		* through /sys/module/ramoops/parameters/
		*/
		mem_size = pdata->mem_size;
		mem_address = pdata->mem_address;
		record_size = pdata->record_size;
		dump_oops = pdata->dump_oops;

		return 0;

		fail1:

Admin message