Commit a0de6e07 authored May 28, 2024 by Yang Yingliang Committed by Li Lingfeng May 28, 2024

mmc: sdio: fix possible resource leaks in some error paths

mainline inclusion
from mainline-v6.2-rc8
commit 605d9fb9
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I9R4LT
CVE: CVE-2023-52730

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=605d9fb9556f8f5fb4566f4df1480f280f308ded



--------------------------------

If sdio_add_func() or sdio_init_func() fails, sdio_remove_func() can
not release the resources, because the sdio function is not presented
in these two cases, it won't call of_node_put() or put_device().

To fix these leaks, make sdio_func_present() only control whether
device_del() needs to be called or not, then always call of_node_put()
and put_device().

In error case in sdio_init_func(), the reference of 'card->dev' is
not get, to avoid redundant put in sdio_free_func_cis(), move the
get_device() to sdio_alloc_func() and put_device() to sdio_release_func(),
it can keep the get/put function be balanced.

Without this patch, while doing fault inject test, it can get the
following leak reports, after this fix, the leak is gone.

unreferenced object 0xffff888112514000 (size 2048):
  comm "kworker/3:2", pid 65, jiffies 4294741614 (age 124.774s)
  hex dump (first 32 bytes):
    00 e0 6f 12 81 88 ff ff 60 58 8d 06 81 88 ff ff  ..o.....`X......
    10 40 51 12 81 88 ff ff 10 40 51 12 81 88 ff ff  .@Q......@Q.....
  backtrace:
    [<000000009e5931da>] kmalloc_trace+0x21/0x110
    [<000000002f839ccb>] mmc_alloc_card+0x38/0xb0 [mmc_core]
    [<0000000004adcbf6>] mmc_sdio_init_card+0xde/0x170 [mmc_core]
    [<000000007538fea0>] mmc_attach_sdio+0xcb/0x1b0 [mmc_core]
    [<00000000d4fdeba7>] mmc_rescan+0x54a/0x640 [mmc_core]

unreferenced object 0xffff888112511000 (size 2048):
  comm "kworker/3:2", pid 65, jiffies 4294741623 (age 124.766s)
  hex dump (first 32 bytes):
    00 40 51 12 81 88 ff ff e0 58 8d 06 81 88 ff ff  .@Q......X......
    10 10 51 12 81 88 ff ff 10 10 51 12 81 88 ff ff  ..Q.......Q.....
  backtrace:
    [<000000009e5931da>] kmalloc_trace+0x21/0x110
    [<00000000fcbe706c>] sdio_alloc_func+0x35/0x100 [mmc_core]
    [<00000000c68f4b50>] mmc_attach_sdio.cold.18+0xb1/0x395 [mmc_core]
    [<00000000d4fdeba7>] mmc_rescan+0x54a/0x640 [mmc_core]

Fixes: 3d10a1ba ("sdio: fix reference counting in sdio_remove_func()")
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20230130125808.3471254-1-yangyingliang@huawei.com


Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

Conflicts:
  drivers/mmc/core/sdio_bus.c
[Commit 9972e6b4 ("mmc: core: Fix kernel panic when remove
non-standard SDIO card") add judgment of func->card->quirks in
sdio_release_func().]
Signed-off-by: Li Lingfeng <lilingfeng3@huawei.com>

parent 505199cb

drivers/mmc/core/sdio_bus.c

+14 −3

Original line number	Diff line number	Diff line
		@@ -266,6 +266,12 @@ static void sdio_release_func(struct device *dev)

		sdio_free_func_cis(func);

		/*
		* We have now removed the link to the tuples in the
		* card structure, so remove the reference.
		*/
		put_device(&func->card->dev);

		kfree(func->info);
		kfree(func->tmpbuf);
		kfree(func);
		@@ -296,6 +302,12 @@ struct sdio_func sdio_alloc_func(struct mmc_card card)

		device_initialize(&func->dev);

		/*
		* We may link to tuples in the card structure,
		* we need make sure we have a reference to it.
		*/
		get_device(&func->card->dev);

		func->dev.parent = &card->dev;
		func->dev.bus = &sdio_bus_type;
		func->dev.release = sdio_release_func;
		@@ -349,10 +361,9 @@ int sdio_add_func(struct sdio_func *func)
		*/
		void sdio_remove_func(struct sdio_func *func)
		{
		if (!sdio_func_present(func))
		return;

		if (sdio_func_present(func))
		device_del(&func->dev);

		of_node_put(func->dev.of_node);
		put_device(&func->dev);
		}

drivers/mmc/core/sdio_cis.c

+0 −12

Original line number	Diff line number	Diff line
		@@ -378,12 +378,6 @@ int sdio_read_func_cis(struct sdio_func *func)
		if (ret)
		return ret;

		/*
		* Since we've linked to tuples in the card structure,
		* we must make sure we have a reference to it.
		*/
		get_device(&func->card->dev);

		/*
		* Vendor/device id is optional for function CIS, so
		* copy it from the card structure as needed.
		@@ -409,11 +403,5 @@ void sdio_free_func_cis(struct sdio_func *func)
		}

		func->tuples = NULL;

		/*
		* We have now removed the link to the tuples in the
		* card structure, so remove the reference.
		*/
		put_device(&func->card->dev);
		}