Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Pawel Laszczak <pawell@cadence.com>
To:     Roger Quadros <rogerq@ti.com>,
        "peter.chen@nxp.com" <peter.chen@nxp.com>
CC:     "balbi@kernel.org" <balbi@kernel.org>, "nm@ti.com" <nm@ti.com>,
        "nsekhar@ti.com" <nsekhar@ti.com>,
        "a-govindraju@ti.com" <a-govindraju@ti.com>,
        "linux-usb@vger.kernel.org" <linux-usb@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: RE: [PATCH] usb: cdns3: fix NULL pointer dereference on no platform
 data
Thread-Topic: [PATCH] usb: cdns3: fix NULL pointer dereference on no platform
 data
Thread-Index: AQHWwYZYHPX8ySLV70yqfPPTZ98GaKnVkmOQ
Date:   Mon, 23 Nov 2020 11:24:39 +0000
Message-ID: <DM6PR07MB552920936C6FE0EF14FD25F1DDFC0@DM6PR07MB5529.namprd07.prod.outlook.com>
References: <20201123104931.2653-1-rogerq@ti.com>
In-Reply-To: <20201123104931.2653-1-rogerq@ti.com>
Accept-Language: en-US
Content-Language: en-US
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: cf99f194-327f-447f-43b4-08d88fa25df3
X-MS-Exchange-CrossTenant-originalarrivaltime: 23 Nov 2020 11:24:39.5363
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: d36035c5-6ce6-4662-a3dc-e762e61ae4c9
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: XMLrmW76pYbek3YD8TD693nokAo4ynj/tD6rW2H40ib5DuCXYrJsEY5fGn+D6hJXzpPumMeIywrq1Z665DNsvOKURM781G3ALNYMFKocF/I=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR07MB3097
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.312,18.0.737
 definitions=2020-11-23_06:2020-11-23,2020-11-23 signatures=0
X-Proofpoint-Spam-Details: rule=outbound_check_notspam policy=outbound_check score=0
 priorityscore=1501 adultscore=0 malwarescore=0 phishscore=0 bulkscore=0
 suspectscore=0 lowpriorityscore=0 spamscore=0 impostorscore=0 mlxscore=0
 clxscore=1011 mlxlogscore=920 classifier=spam adjust=0 reason=mlx
 scancount=1 engine=8.12.0-2009150000 definitions=main-2011230079
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi,

>
>Some platforms (e.g. TI) will not have any platform data which will
>lead to NULL pointer dereference if we don't check for NULL pdata.
>
>Fixes: a284b7fd1b8f ("usb: cdns3: add quirk for enable runtime pm by defau=
lt")
>Reported-by: Nishanth Menon <nm@ti.com>
>Signed-off-by: Roger Quadros <rogerq@ti.com>

Acked-by: Pawel Laszczak <pawell@cadence.com>

I see the same issue on my PCI based platform.=20

But I afraid that there will be some conflict with applying my CDSNP series=
 after
applying this patch on Peter Chen branch :(

>---
> drivers/usb/cdns3/core.c | 2 +-
> drivers/usb/cdns3/host.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/drivers/usb/cdns3/core.c b/drivers/usb/cdns3/core.c
>index 54d841aa626f..0f08aebce86d 100644
>--- a/drivers/usb/cdns3/core.c
>+++ b/drivers/usb/cdns3/core.c
>@@ -559,7 +559,7 @@ static int cdns3_probe(struct platform_device *pdev)
> 	device_set_wakeup_capable(dev, true);
> 	pm_runtime_set_active(dev);
> 	pm_runtime_enable(dev);
>-	if (!(cdns->pdata->quirks & CDNS3_DEFAULT_PM_RUNTIME_ALLOW))
>+	if (!(cdns->pdata && (cdns->pdata->quirks & CDNS3_DEFAULT_PM_RUNTIME_ALL=
OW)))
> 		pm_runtime_forbid(dev);
>
> 	/*
>diff --git a/drivers/usb/cdns3/host.c b/drivers/usb/cdns3/host.c
>index 08103785a17a..ec89f2e5430f 100644
>--- a/drivers/usb/cdns3/host.c
>+++ b/drivers/usb/cdns3/host.c
>@@ -59,7 +59,7 @@ static int __cdns3_host_init(struct cdns3 *cdns)
> 		goto err1;
> 	}
>
>-	if (cdns->pdata->quirks & CDNS3_DEFAULT_PM_RUNTIME_ALLOW)
>+	if (cdns->pdata && (cdns->pdata->quirks & CDNS3_DEFAULT_PM_RUNTIME_ALLOW=
))
> 		cdns->xhci_plat_data->quirks |=3D XHCI_DEFAULT_PM_RUNTIME_ALLOW;
>
> 	ret =3D platform_device_add_data(xhci, cdns->xhci_plat_data,

--
Regards,
Pawel Laszczak