Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

memstick: rtsx_usb_ms: fix UAF

This patch fixes the following issues:
1. memstick_free_host() will free the host, so the use of ms_dev(host) after
it will be a problem. To fix this, move memstick_free_host() after when we
are done with ms_dev(host).
2. In rtsx_usb_ms_drv_remove(), pm need to be disabled before we remove
and free host otherwise memstick_check will be called and UAF will
happen.

[ 11.351173] BUG: KASAN: use-after-free in rtsx_usb_ms_drv_remove+0x94/0x140 [rtsx_usb_ms]
[ 11.357077] rtsx_usb_ms_drv_remove+0x94/0x140 [rtsx_usb_ms]
[ 11.357376] platform_remove+0x2a/0x50
[ 11.367531] Freed by task 298:
[ 11.368537] kfree+0xa4/0x2a0
[ 11.368711] device_release+0x51/0xe0
[ 11.368905] kobject_put+0xa2/0x120
[ 11.369090] rtsx_usb_ms_drv_remove+0x8c/0x140 [rtsx_usb_ms]
[ 11.369386] platform_remove+0x2a/0x50

[ 12.038408] BUG: KASAN: use-after-free in __mutex_lock.isra.0+0x3ec/0x7c0
[ 12.045432] mutex_lock+0xc9/0xd0
[ 12.046080] memstick_check+0x6a/0x578 [memstick]
[ 12.046509] process_one_work+0x46d/0x750
[ 12.052107] Freed by task 297:
[ 12.053115] kfree+0xa4/0x2a0
[ 12.053272] device_release+0x51/0xe0
[ 12.053463] kobject_put+0xa2/0x120
[ 12.053647] rtsx_usb_ms_drv_remove+0xc4/0x140 [rtsx_usb_ms]
[ 12.053939] platform_remove+0x2a/0x50

Signed-off-by: Tong Zhang <ztong0001@gmail.com>
Co-developed-by: Ulf Hansson <ulf.hansson@linaro.org>
Link: https://lore.kernel.org/r/20210511163944.1233295-1-ztong0001@gmail.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

authored by

Tong Zhang and committed by
Ulf Hansson
42933c8a f722e650

+4 -6
+4 -6
drivers/memstick/host/rtsx_usb_ms.c
··· 799 799 800 800 return 0; 801 801 err_out: 802 - memstick_free_host(msh); 803 802 pm_runtime_disable(ms_dev(host)); 804 803 pm_runtime_put_noidle(ms_dev(host)); 804 + memstick_free_host(msh); 805 805 return err; 806 806 } 807 807 ··· 828 828 } 829 829 mutex_unlock(&host->host_mutex); 830 830 831 - memstick_remove_host(msh); 832 - memstick_free_host(msh); 833 - 834 831 /* Balance possible unbalanced usage count 835 832 * e.g. unconditional module removal 836 833 */ ··· 835 838 pm_runtime_put(ms_dev(host)); 836 839 837 840 pm_runtime_disable(ms_dev(host)); 838 - platform_set_drvdata(pdev, NULL); 839 - 841 + memstick_remove_host(msh); 840 842 dev_dbg(ms_dev(host), 841 843 ": Realtek USB Memstick controller has been removed\n"); 844 + memstick_free_host(msh); 845 + platform_set_drvdata(pdev, NULL); 842 846 843 847 return 0; 844 848 }