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

Commit 0c052aab authored by Xenia Ragiadakou's avatar Xenia Ragiadakou Committed by Sarah Sharp
Browse files

xhci: fix incorrect type in assignment in xhci_address_device() 



The field 'dev_info' in struct xhci_slot_ctx has type __le32 and it needs
to be converted to CPU byteorder for the correct retrieval of its subfield
'Context Entries'. This field is used by the trace event 'xhci_address_ctx'
to trace only the contexts of valid endpoints.
This bug was found using sparse.

Signed-off-by: default avatarXenia Ragiadakou <burzalodowa@gmail.com>
Signed-off-by: default avatarSarah Sharp <sarah.a.sharp@linux.intel.com>
parent d20c7225

drivers/usb/host/xhci.c

+3 −3
Original line number Diff line number Diff line
@@ -3771,7 +3771,7 @@ int xhci_address_device(struct usb_hcd *hcd, struct usb_device *udev) 
	xhci_dbg(xhci, "Slot ID %d Input Context:\n", udev->slot_id);

	xhci_dbg_ctx(xhci, virt_dev->in_ctx, 2);

	trace_xhci_address_ctx(xhci, virt_dev->in_ctx,

				slot_ctx->dev_info >> 27);

				le32_to_cpu(slot_ctx->dev_info) >> 27);



	spin_lock_irqsave(&xhci->lock, flags);

	cmd_trb = xhci_find_next_enqueue(xhci->cmd_ring);
@@ -3850,7 +3850,7 @@ int xhci_address_device(struct usb_hcd *hcd, struct usb_device *udev) 
	xhci_dbg(xhci, "Slot ID %d Input Context:\n", udev->slot_id);

	xhci_dbg_ctx(xhci, virt_dev->in_ctx, 2);

	trace_xhci_address_ctx(xhci, virt_dev->in_ctx,

				slot_ctx->dev_info >> 27);

				le32_to_cpu(slot_ctx->dev_info) >> 27);

	xhci_dbg(xhci, "Slot ID %d Output Context:\n", udev->slot_id);

	xhci_dbg_ctx(xhci, virt_dev->out_ctx, 2);

	/*
@@ -3859,7 +3859,7 @@ int xhci_address_device(struct usb_hcd *hcd, struct usb_device *udev) 
	 */

	slot_ctx = xhci_get_slot_ctx(xhci, virt_dev->out_ctx);

	trace_xhci_address_ctx(xhci, virt_dev->out_ctx,

				slot_ctx->dev_info >> 27);

				le32_to_cpu(slot_ctx->dev_info) >> 27);

	/* Zero the input context control for later use */

	ctrl_ctx->add_flags = 0;

	ctrl_ctx->drop_flags = 0;