Skip to content

Commit

Permalink
xhci: check control context is valid before dereferencing it.
Browse files Browse the repository at this point in the history
[ Upstream commit 597899d ]

Don't dereference ctrl_ctx before checking it's valid.
Issue reported by Klockwork

Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Link: https://lore.kernel.org/r/20210406070208.3406266-3-mathias.nyman@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
matnyman authored and gregkh committed May 12, 2021
1 parent 396481c commit bf6c351
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions drivers/usb/host/xhci.c
Expand Up @@ -3269,6 +3269,14 @@ static void xhci_endpoint_reset(struct usb_hcd *hcd,

/* config ep command clears toggle if add and drop ep flags are set */
ctrl_ctx = xhci_get_input_control_ctx(cfg_cmd->in_ctx);
if (!ctrl_ctx) {
spin_unlock_irqrestore(&xhci->lock, flags);
xhci_free_command(xhci, cfg_cmd);
xhci_warn(xhci, "%s: Could not get input context, bad type.\n",
__func__);
goto cleanup;
}

xhci_setup_input_ctx_for_config_ep(xhci, cfg_cmd->in_ctx, vdev->out_ctx,
ctrl_ctx, ep_flag, ep_flag);
xhci_endpoint_copy(xhci, cfg_cmd->in_ctx, vdev->out_ctx, ep_index);
Expand Down

0 comments on commit bf6c351

Please sign in to comment.