Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   "Alim Akhtar" <alim.akhtar@samsung.com>
To:     <linux-kernel@vger.kernel.org>, <linux-phy@lists.infradead.org>
Cc:     <krzysztof.kozlowski+dt@linaro.org>, <vkoul@kernel.org>,
        <chanho61.park@samsung.com>, <pankaj.dubey@samsung.com>
In-Reply-To: <20220610070547.71193-1-alim.akhtar@samsung.com>
Subject: RE: [PATCH -next] phy: samsung-ufs: fix NULL pointer dereference
Date:   Fri, 10 Jun 2022 14:45:32 +0530
Message-ID: <000501d87caa$a3ebe520$ebc3af60$@samsung.com>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Thread-Index: AQJNUr2mveM3EJGNpu0kIdNV5dOukgIPmyx5rE4yYKA=
Content-Language: en-us
Content-Type: text/plain; charset="utf-8"
CMS-TYPE: 105P
DLP-Filter: Pass
References: <CGME20220610070811epcas5p3c62ef9ad9c82092deac59ff9be896677@epcas5p3.samsung.com>
        <20220610070547.71193-1-alim.akhtar@samsung.com>
Precedence: bulk

Sorry for the noise.

Please ignore this patch

>-----Original Message-----
>From: Alim Akhtar =5Bmailto:alim.akhtar=40samsung.com=5D
>Sent: Friday, June 10, 2022 12:36 PM
>To: linux-kernel=40vger.kernel.org; linux-phy=40lists.infradead.org
>Cc: krzysztof.kozlowski+dt=40linaro.org; vkoul=40kernel.org;
>chanho61.park=40samsung.com; pankaj.dubey=40samsung.com; Alim Akhtar
><alim.akhtar=40samsung.com>
>Subject: =5BPATCH -next=5D phy: samsung-ufs: fix NULL pointer dereference
>
>commit f86c1d0a58b1f63a (=22phy: samsung: ufs: remove drvdata from struct
>samsung_ufs_phy=22)
>
>removes _drvdata_ initialization which resulting in NULL pointer
>dereferencing in samsung_ufs_phy_wait_for_lock_acq(). Fix this by initiali=
zing
>drvdata.
>
>The said commit also duplicate =22has_symbol_clk=22 both in drvdata struct=
 and in
>samsung_ufs_phy struct, let's go back and use only one =22has_symbol_clk=
=22.
>
>Fixes: f86c1d0a58b1 phy: samsung: ufs: remove drvdata from struct
>samsung_ufs_phy
>Signed-off-by: Alim Akhtar <alim.akhtar=40samsung.com>
>---
> drivers/phy/samsung/phy-samsung-ufs.c =7C 6 +++---
>drivers/phy/samsung/phy-samsung-ufs.h =7C 1 -
> 2 files changed, 3 insertions(+), 4 deletions(-)
>
>diff --git a/drivers/phy/samsung/phy-samsung-ufs.c
>b/drivers/phy/samsung/phy-samsung-ufs.c
>index 206a79c69a6c..6708877b20d7 100644
>--- a/drivers/phy/samsung/phy-samsung-ufs.c
>+++ b/drivers/phy/samsung/phy-samsung-ufs.c
>=40=40 -207,7 +207,7 =40=40 static int samsung_ufs_phy_init(struct phy *ph=
y)
> 	ss_phy->lane_cnt =3D phy->attrs.bus_width;
> 	ss_phy->ufs_phy_state =3D CFG_PRE_INIT;
>
>-	if (ss_phy->has_symbol_clk) =7B
>+	if (ss_phy->drvdata->has_symbol_clk) =7B
> 		ret =3D samsung_ufs_phy_symbol_clk_init(ss_phy);
> 		if (ret)
> 			dev_err(ss_phy->dev, =22failed to set ufs phy symbol
>clocks=5Cn=22); =40=40 -259,7 +259,7 =40=40 static int samsung_ufs_phy_exi=
t(struct phy
>*phy)
>
> 	clk_disable_unprepare(ss_phy->ref_clk);
>
>-	if (ss_phy->has_symbol_clk) =7B
>+	if (ss_phy->drvdata->has_symbol_clk) =7B
> 		clk_disable_unprepare(ss_phy->tx0_symbol_clk);
> 		clk_disable_unprepare(ss_phy->rx0_symbol_clk);
> 		clk_disable_unprepare(ss_phy->rx1_symbol_clk);
>=40=40 -327,8 +327,8 =40=40 static int samsung_ufs_phy_probe(struct
>platform_device *pdev)
>
> 	drvdata =3D match->data;
> 	phy->dev =3D dev;
>+	phy->drvdata =3D drvdata;
> 	phy->cfgs =3D drvdata->cfgs;
>-	phy->has_symbol_clk =3D drvdata->has_symbol_clk;
> 	memcpy(&phy->isol, &drvdata->isol, sizeof(phy->isol));
>
> 	if (=21of_property_read_u32_index(dev->of_node, =22samsung,pmu-
>syscon=22, 1, diff --git a/drivers/phy/samsung/phy-samsung-ufs.h
>b/drivers/phy/samsung/phy-samsung-ufs.h
>index 854b53bdf347..b9144586daf5 100644
>--- a/drivers/phy/samsung/phy-samsung-ufs.h
>+++ b/drivers/phy/samsung/phy-samsung-ufs.h
>=40=40 -125,7 +125,6 =40=40 struct samsung_ufs_phy =7B
> 	const struct samsung_ufs_phy_drvdata *drvdata;
> 	const struct samsung_ufs_phy_cfg * const *cfgs;
> 	struct samsung_ufs_phy_pmu_isol isol;
>-	bool has_symbol_clk;
> 	u8 lane_cnt;
> 	int ufs_phy_state;
> 	enum phy_mode mode;
>
>base-commit: ff539ac73ea559a8c146d99ab14bfcaddd30547a
>--
>2.25.1