usb: xhci: validate CAPLENGTH in xhci_gen_setup()
Subsystems (2)
PATCH 1/1 usb: xhci: validate CAPLENGTH in xhci_gen_setup()
xhci_hcd can be bound to arbitrary PCI devices via the driver_override sysfs knob. When this happens to a device whose MMIO registers are not xHCI capability registers, xhci_gen_setup() reads CAPLENGTH from the foreign register layout and uses it as a byte offset to compute op_regs.
A non-xHCI device can return a CAPLENGTH value that is
- not large enough to fit the capability register block, or
- not 4-byte aligned (e.g. the NVMe CAP register's low byte is
0xff, which becomes CAPLENGTH = 0xff).
The unaligned case is especially harmful on arm64: MMIO is Device memory and Device-nGnRE accesses require natural alignment, so readl(&op_regs->command) faults with an alignment exception even when the address is within the ioremapped region.
Validate CAPLENGTH in xhci_gen_setup() and fail probe with -ENODEV if the value is smaller than 0x20 (capability registers are 32 bytes per the xHCI spec), not 4-byte aligned, or leaves no room for the operational register space within the mapped region.
The run_regs_off read on the next line has the same shape, but is not reachable on the xhci_halt code path and is left untouched here.
Reproduced on a QEMU virt machine with a syzkaller repro that unbinds the NVMe driver on 0000:00:02.0 and binds xhci_hcd via driver_override. Before this patch the kernel Oopses and panics; after, the probe is rejected cleanly. Ran the repro for over two hours (66,709 consecutive probe attempts) with zero Oopses.
--- drivers/usb/host/xhci.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
drivers/usb/host/xhci.c +11 -3
@@ -5432,7 +5432,7 @@ int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks)*/ struct device *dev = hcd->self.sysdev;int retval; -u32 hcs_params1; +u32 hcs_params1, capbase;/* Accept arbitrarily long scatter-gather lists */ hcd->self.sg_tablesize = ~0 ;
@@ -5453,8 +5453,16 @@ int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks)mutex_init (&xhci->mutex); xhci->main_hcd = hcd; xhci->cap_regs = hcd->regs; - xhci->op_regs = hcd->regs + -HC_LENGTH (readl (&xhci->cap_regs->hc_capbase)); + capbase =readl (&xhci->cap_regs->hc_capbase); +if (HC_LENGTH (capbase) <0x20 || + (HC_LENGTH (capbase) &0x3 ) || + (hcd->rsrc_len && +HC_LENGTH (capbase) +sizeof (struct xhci_op_regs ) > hcd->rsrc_len)) { +xhci_err (xhci,"Invalid CAPLENGTH %#x (rsrc_len %#lx)\n" , +HC_LENGTH (capbase), (unsigned long )hcd->rsrc_len); +return -ENODEV ; + } + xhci->op_regs = hcd->regs +HC_LENGTH (capbase); xhci->run_regs = hcd->regs + (readl (&xhci->cap_regs->run_regs_off) &RTSOFF_MASK );/* Cache read-only capability registers */
Signature · 1 line
2.55.0
Greg Kroah-Hartman
maintainerQuoted 34 lines · erdaitianjiao
xhci_hcdcan be bound to arbitrary PCI devices via thedriver_overridesysfs knob. When this happens to a device whose MMIO registers are not xHCI capability registers,xhci_gen_setup()reads CAPLENGTH from the foreign register layout and uses it as a byte offset to computeop_regs.A non-xHCI device can return a CAPLENGTH value that is
- not large enough to fit the capability register block, or
- not 4-byte aligned (e.g. the NVMe CAP register's low byte is0xff, which becomes CAPLENGTH = 0xff).The unaligned case is especially harmful on arm64: MMIO is Device memory and Device-nGnRE accesses require natural alignment, so
readl(&op_regs->command)faults with an alignment exception even when the address is within the ioremapped region.Validate CAPLENGTH in
xhci_gen_setup()and fail probe with-ENODEVif the value is smaller than0x20(capability registers are 32 bytes per the xHCI spec), not 4-byte aligned, or leaves no room for the operational register space within the mapped region.The
run_regs_offread on the next line has the same shape, but is not reachable on thexhci_haltcode path and is left untouched here.Reproduced on a QEMU virt machine with a syzkaller repro that unbinds the NVMe driver on 0000:00:02.0 and binds
xhci_hcdviadriver_override. Before this patch the kernel Oopses and panics; after, the probe is rejected cleanly. Ran the repro for over two hours (66,709 consecutive probe attempts) with zero Oopses.
Quoted 7 lines
Reported-by [email protected]Fixes 552e0c4f12fe ("usb/xhci: move xhci_gen_setup() away from -pci.")Signed-off-by erdaitianjiao <[email protected]>--- drivers/usb/host/xhci.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
Hi,
This is the friendly patch-bot of Greg Kroah-Hartman. You have sent him a patch that has triggered this response. He used to manually respond to these common problems, but in order to save his sanity (he kept writing the same thing over and over, yet to different people), I was created. Hopefully you will not take offence and will fix the problem in your patch and resubmit it so that it can be accepted into the Linux kernel tree.
You are receiving this message because of the following common error(s) as indicated below:
- It looks like you did not use your "real" name for the patch on either the Signed-off-by: line, or the From: line (both of which have to match). Please read the kernel file, Documentation/process/submitting-patches.rst for how to do this correctly.
If you wish to discuss this problem further, or you have questions about how to resolve this issue, please feel free to respond to this email and Greg will reply once he has dug out from the pending patches received from other developers.
thanks,
greg k-h's patch email bot
Greg Kroah-Hartman
maintainerQuoted 10 lines · erdaitianjiao
xhci_hcdcan be bound to arbitrary PCI devices via thedriver_overridesysfs knob. When this happens to a device whose MMIO registers are not xHCI capability registers,xhci_gen_setup()reads CAPLENGTH from the foreign register layout and uses it as a byte offset to computeop_regs.A non-xHCI device can return a CAPLENGTH value that is
- not large enough to fit the capability register block, or
- not 4-byte aligned (e.g. the NVMe CAP register's low byte is0xff, which becomes CAPLENGTH = 0xff).
That's crazy, and I'm getting tired of rejecting patches like this. Again, if you use 'bind' to attach a device to a driver you HAVE to know what you are doing. Attempting to fix up each and every driver to handle this is not ok, and will not happen.
sorry, syzbot is broken and needs to be fixed,
greg k-h
Understood, thanks for the explanation. I'll skip driver_override triggered issues going forward and pick bugs with more meaningful trigger paths.
Best regards,
Tianjiao Erdai