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

mfd: rtsx_usb: Prevent DMA from stack

Functions rtsx_usb_ep0_read_register() and rtsx_usb_get_card_status()
both use arbitrary buffer addresses from arguments directly for DMA and
the buffers could be located in stack. This was caught by DMA-API debug
check.

Fixes this by using double-buffers via kzalloc in both functions to
guarantee the validity of DMA buffer.

WARNING: CPU: 1 PID: 25 at lib/dma-debug.c:1166 check_for_stack+0x96/0xe0()
ehci-pci 0000:00:1a.0: DMA-API: device driver maps memory from stack
[addr=ffff8801199e3cef]
Modules linked in: rtsx_usb_ms arc4 memstick intel_rapl iosf_mbi
rtl8192ce snd_hda_codec_hdmi snd_hda_codec_realtek
snd_hda_codec_generic snd_hda_intel rtl_pci rtl8192c_common
snd_hda_controller x86_pkg_temp_thermal snd_hda_codec rtlwifi mac80211
coretemp kvm_intel kvm iTCO_wdt snd_hwdep snd_seq snd_seq_device
crct10dif_pclmul iTCO_vendor_support sparse_keymap cfg80211
crc32_pclmul snd_pcm crc32c_intel ghash_clmulni_intel rfkill i2c_i801
snd_timer shpchp snd serio_raw mei_me lpc_ich soundcore mei tpm_tis
tpm wmi nfsd auth_rpcgss nfs_acl lockd grace sunrpc i915
rtsx_usb_sdmmc mmc_core 8021q uas garp stp i2c_algo_bit llc mrp
drm_kms_helper usb_storage drm rtsx_usb mfd_core r8169 mii video
CPU: 1 PID: 25 Comm: kworker/1:2 Not tainted 3.20.0-0.rc0.git7.3.fc22.x86_64 #1
Hardware name: WB WB-B06211/WB-B0621, BIOS EB062IWB V1.0 12/12/2013
Workqueue: events rtsx_usb_ms_handle_req [rtsx_usb_ms]
0000000000000000 000000003d188e66 ffff8801199e3808 ffffffff8187642b
0000000000000000 ffff8801199e3860 ffff8801199e3848 ffffffff810ab39a
ffff8801199e3864 ffff8801199e3cef ffff880119b57098 ffff880119b37320
Call Trace:
[<ffffffff8187642b>] dump_stack+0x4c/0x65
[<ffffffff810ab39a>] warn_slowpath_common+0x8a/0xc0
[<ffffffff810ab425>] warn_slowpath_fmt+0x55/0x70
[<ffffffff8187efe6>] ? _raw_spin_unlock_irqrestore+0x36/0x70
[<ffffffff81453156>] check_for_stack+0x96/0xe0
[<ffffffff81453934>] debug_dma_map_page+0x104/0x150
[<ffffffff81613b86>] usb_hcd_map_urb_for_dma+0x646/0x790
[<ffffffff81614165>] usb_hcd_submit_urb+0x1d5/0xa90
[<ffffffff81106f8f>] ? mark_held_locks+0x7f/0xc0
[<ffffffff81106f8f>] ? mark_held_locks+0x7f/0xc0
[<ffffffff81103a15>] ? lockdep_init_map+0x65/0x5d0
[<ffffffff81615d7e>] usb_submit_urb+0x42e/0x5f0
[<ffffffff81616787>] usb_start_wait_urb+0x77/0x190
[<ffffffff8124f035>] ? __kmalloc+0x205/0x2d0
[<ffffffff8161697c>] usb_control_msg+0xdc/0x130
[<ffffffffa0031669>] rtsx_usb_ep0_read_register+0x59/0x70 [rtsx_usb]
[<ffffffffa00310c1>] ? rtsx_usb_get_rsp+0x41/0x50 [rtsx_usb]
[<ffffffffa071da4e>] rtsx_usb_ms_handle_req+0x7ce/0x9c5 [rtsx_usb_ms]

Reported-by: Josh Boyer <jwboyer@fedoraproject.org>
Signed-off-by: Roger Tseng <rogerable@realtek.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

authored by

Roger Tseng and committed by
Lee Jones
3a43477f 9eccca08

+24 -6
+24 -6
drivers/mfd/rtsx_usb.c
··· 196 196 int rtsx_usb_ep0_read_register(struct rtsx_ucr *ucr, u16 addr, u8 *data) 197 197 { 198 198 u16 value; 199 + u8 *buf; 200 + int ret; 199 201 200 202 if (!data) 201 203 return -EINVAL; 202 - *data = 0; 204 + 205 + buf = kzalloc(sizeof(u8), GFP_KERNEL); 206 + if (!buf) 207 + return -ENOMEM; 203 208 204 209 addr |= EP0_READ_REG_CMD << EP0_OP_SHIFT; 205 210 value = swab16(addr); 206 211 207 - return usb_control_msg(ucr->pusb_dev, 212 + ret = usb_control_msg(ucr->pusb_dev, 208 213 usb_rcvctrlpipe(ucr->pusb_dev, 0), RTSX_USB_REQ_REG_OP, 209 214 USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE, 210 - value, 0, data, 1, 100); 215 + value, 0, buf, 1, 100); 216 + *data = *buf; 217 + 218 + kfree(buf); 219 + return ret; 211 220 } 212 221 EXPORT_SYMBOL_GPL(rtsx_usb_ep0_read_register); 213 222 ··· 297 288 int rtsx_usb_get_card_status(struct rtsx_ucr *ucr, u16 *status) 298 289 { 299 290 int ret; 291 + u16 *buf; 300 292 301 293 if (!status) 302 294 return -EINVAL; 303 295 304 - if (polling_pipe == 0) 296 + if (polling_pipe == 0) { 297 + buf = kzalloc(sizeof(u16), GFP_KERNEL); 298 + if (!buf) 299 + return -ENOMEM; 300 + 305 301 ret = usb_control_msg(ucr->pusb_dev, 306 302 usb_rcvctrlpipe(ucr->pusb_dev, 0), 307 303 RTSX_USB_REQ_POLL, 308 304 USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE, 309 - 0, 0, status, 2, 100); 310 - else 305 + 0, 0, buf, 2, 100); 306 + *status = *buf; 307 + 308 + kfree(buf); 309 + } else { 311 310 ret = rtsx_usb_get_status_with_bulk(ucr, status); 311 + } 312 312 313 313 /* usb_control_msg may return positive when success */ 314 314 if (ret < 0)