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

Commit f88baf68 authored by Geliang Tang's avatar Geliang Tang Committed by Kees Cook
Browse files

ramoops: move spin_lock_init after kmalloc error checking 



If cxt->pstore.buf allocated failed, no need to initialize
cxt->pstore.buf_lock. So this patch moves spin_lock_init() after the
error checking.

Signed-off-by: default avatarGeliang Tang <geliangtang@gmail.com>
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
parent d771fdf9

fs/pstore/ram.c

+1 −1
Original line number Diff line number Diff line
@@ -635,12 +635,12 @@ static int ramoops_probe(struct platform_device *pdev) 
		cxt->pstore.bufsize = 1024; /* LOG_LINE_MAX */

	cxt->pstore.bufsize = max(cxt->record_size, cxt->pstore.bufsize);

	cxt->pstore.buf = kmalloc(cxt->pstore.bufsize, GFP_KERNEL);

	spin_lock_init(&cxt->pstore.buf_lock);

	if (!cxt->pstore.buf) {

		pr_err("cannot allocate pstore buffer\n");

		err = -ENOMEM;

		goto fail_clear;

	}

	spin_lock_init(&cxt->pstore.buf_lock);



	cxt->pstore.flags = PSTORE_FLAGS_DMESG;

	if (cxt->console_size)