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

Commit 5631e857 authored by Kees Cook's avatar Kees Cook
Browse files

pstore/ram: Avoid allocation and leak of platform data 



Yue Hu noticed that when parsing device tree the allocated platform data
was never freed. Since it's not used beyond the function scope, this
switches to using a stack variable instead.

Reported-by: default avatarYue Hu <huyue2@yulong.com>
Fixes: 35da6094 ("pstore/ram: add Device Tree bindings")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
parent 6a4c9ab1

fs/pstore/ram.c

+3 −6
Original line number Diff line number Diff line
@@ -710,18 +710,15 @@ static int ramoops_probe(struct platform_device *pdev) 
{

	struct device *dev = &pdev->dev;

	struct ramoops_platform_data *pdata = dev->platform_data;

	struct ramoops_platform_data pdata_local;

	struct ramoops_context *cxt = &oops_cxt;

	size_t dump_mem_sz;

	phys_addr_t paddr;

	int err = -EINVAL;



	if (dev_of_node(dev) && !pdata) {

		pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);

		if (!pdata) {

			pr_err("cannot allocate platform data buffer\n");

			err = -ENOMEM;

			goto fail_out;

		}

		pdata = &pdata_local;

		memset(pdata, 0, sizeof(*pdata));



		err = ramoops_parse_dt(pdev, pdata);

		if (err < 0)