releases/5.0.1/xhci-tegra-prevent-error-pointer-dereference.patch

   1 From 0326ccb5feac6eac35ba6254260e2774277cd976 Mon Sep 17 00:00:00 2001
   2 From: Thierry Reding <treding@nvidia.com>
   3 Date: Wed, 20 Feb 2019 14:48:41 +0100
   4 Subject: xhci: tegra: Prevent error pointer dereference
   5
   6 From: Thierry Reding <treding@nvidia.com>
   7
   8 commit 0326ccb5feac6eac35ba6254260e2774277cd976 upstream.
   9
  10 During initialization, the host and super-speed power domains will
  11 contain an ERR_PTR() encoded error code rather than being NULL. To
  12 avoid a crash, use a !IS_ERR_OR_NULL() condition during cleanup.
  13
  14 Signed-off-by: Thierry Reding <treding@nvidia.com>
  15 Fixes: 6494a9ad86de ("usb: xhci: tegra: Add genpd support")
  16 Cc: stable <stable@vger.kernel.org>
  17 Reviewed-by: Jon Hunter <jonathanh@nvidia.com>
  18 Acked-by: Mathias Nyman <mathias.nyman@linux.intel.com>
  19 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  20
  21 ---
  22  drivers/usb/host/xhci-tegra.c |    4 ++--
  23  1 file changed, 2 insertions(+), 2 deletions(-)
  24
  25 --- a/drivers/usb/host/xhci-tegra.c
  26 +++ b/drivers/usb/host/xhci-tegra.c
  27 @@ -941,9 +941,9 @@ static void tegra_xusb_powerdomain_remov
  28                 device_link_del(tegra->genpd_dl_ss);
  29         if (tegra->genpd_dl_host)
  30                 device_link_del(tegra->genpd_dl_host);
  31 -       if (tegra->genpd_dev_ss)
  32 +       if (!IS_ERR_OR_NULL(tegra->genpd_dev_ss))
  33                 dev_pm_domain_detach(tegra->genpd_dev_ss, true);
  34 -       if (tegra->genpd_dev_host)
  35 +       if (!IS_ERR_OR_NULL(tegra->genpd_dev_host))
  36                 dev_pm_domain_detach(tegra->genpd_dev_host, true);
  37  }
  38