Commit 93421af1 authored by Johan Hovold's avatar Johan Hovold Committed by Ye Bin
Browse files

phy: qcom-qmp: fix reset-controller leak on probe errors 

stable inclusion
from stable-v4.19.247
commit a39d9eccb333b8c07c43ebea1c6dfda122378a0f
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IBP74Q
CVE: CVE-2022-49396

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=a39d9eccb333b8c07c43ebea1c6dfda122378a0f



-------------------------------------------

commit 4d2900f2 upstream.

Make sure to release the lane reset controller in case of a late probe
error (e.g. probe deferral).

Note that due to the reset controller being defined in devicetree in
"lane" child nodes, devm_reset_control_get_exclusive() cannot be used
directly.

Fixes: e78f3d15 ("phy: qcom-qmp: new qmp phy driver for qcom-chipsets")
Cc: stable@vger.kernel.org      # 4.12
Cc: Vivek Gautam <vivek.gautam@codeaurora.org>
Reviewed-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarJohan Hovold <johan+linaro@kernel.org>
Reviewed-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20220427063243.32576-3-johan+linaro@kernel.org


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarYe Bin <yebin10@huawei.com>
parent af84d479

drivers/phy/qualcomm/phy-qcom-qmp.c

+9 −0
Original line number Diff line number Diff line
@@ -1424,6 +1424,11 @@ static const struct phy_ops qcom_qmp_phy_gen_ops = { 
	.owner		= THIS_MODULE,

};



static void qcom_qmp_reset_control_put(void *data)

{

	reset_control_put(data);

}



static

int qcom_qmp_phy_create(struct device *dev, struct device_node *np, int id)

{
@@ -1488,6 +1493,10 @@ int qcom_qmp_phy_create(struct device *dev, struct device_node *np, int id) 
			dev_err(dev, "failed to get lane%d reset\n", id);

			return PTR_ERR(qphy->lane_rst);

		}

		ret = devm_add_action_or_reset(dev, qcom_qmp_reset_control_put,

					       qphy->lane_rst);

		if (ret)

			return ret;

	}



	generic_phy = devm_phy_create(dev, np, &qcom_qmp_phy_gen_ops);