| Message ID | 20200712102837.24340-1-jonathanh@nvidia.com |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | [1/2] usb: tegra: Fix allocation for the FPCI context | expand |
On Sun, Jul 12, 2020 at 11:28:36AM +0100, Jon Hunter wrote: > Commit 5c4e8d3781bc ("usb: host: xhci-tegra: Add support for XUSB > context save/restore") is using the IPFS 'num_offsets' value when > allocating memory for FPCI context instead of the FPCI 'num_offsets'. > We have not observed any specific issues because of this, but could > cause too much memory or too little memory to be allocated. Fix this > by using the FPCI 'num_offsets' for allocating the FPCI memory for > storing the FPCI state. > > Cc: stable@vger.kernel.org > > Fixes: 5c4e8d3781bc ("usb: host: xhci-tegra: Add support for XUSB context save/restore") > > Signed-off-by: Jon Hunter <jonathanh@nvidia.com> > --- > drivers/usb/host/xhci-tegra.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Good catch! Acked-by: Thierry Reding <treding@nvidia.com>
diff --git a/drivers/usb/host/xhci-tegra.c b/drivers/usb/host/xhci-tegra.c index 9ce28ab47f4b..014d79334f50 100644 --- a/drivers/usb/host/xhci-tegra.c +++ b/drivers/usb/host/xhci-tegra.c @@ -856,7 +856,7 @@ static int tegra_xusb_init_context(struct tegra_xusb *tegra) if (!tegra->context.ipfs) return -ENOMEM; - tegra->context.fpci = devm_kcalloc(tegra->dev, soc->ipfs.num_offsets, + tegra->context.fpci = devm_kcalloc(tegra->dev, soc->fpci.num_offsets, sizeof(u32), GFP_KERNEL); if (!tegra->context.fpci) return -ENOMEM;
Commit 5c4e8d3781bc ("usb: host: xhci-tegra: Add support for XUSB context save/restore") is using the IPFS 'num_offsets' value when allocating memory for FPCI context instead of the FPCI 'num_offsets'. We have not observed any specific issues because of this, but could cause too much memory or too little memory to be allocated. Fix this by using the FPCI 'num_offsets' for allocating the FPCI memory for storing the FPCI state. Cc: stable@vger.kernel.org Fixes: 5c4e8d3781bc ("usb: host: xhci-tegra: Add support for XUSB context save/restore") Signed-off-by: Jon Hunter <jonathanh@nvidia.com> --- drivers/usb/host/xhci-tegra.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)