Skip to content

Commit b979f2d

Browse files
jhovoldlumag
authored andcommitted
soc: qcom: pmic_glink_altmode: fix drm bridge use-after-free
A recent DRM series purporting to simplify support for "transparent bridges" and handling of probe deferrals ironically exposed a use-after-free issue on pmic_glink_altmode probe deferral. This has manifested itself as the display subsystem occasionally failing to initialise and NULL-pointer dereferences during boot of machines like the Lenovo ThinkPad X13s. Specifically, the dp-hpd bridge is currently registered before all resources have been acquired which means that it can also be deregistered on probe deferrals. In the meantime there is a race window where the new aux bridge driver (or PHY driver previously) may have looked up the dp-hpd bridge and stored a (non-reference-counted) pointer to the bridge which is about to be deallocated. When the display controller is later initialised, this triggers a use-after-free when attaching the bridges: dp -> aux -> dp-hpd (freed) which may, for example, result in the freed bridge failing to attach: [drm:drm_bridge_attach [drm]] *ERROR* failed to attach bridge /soc@0/phy@88eb000 to encoder TMDS-31: -16 or a NULL-pointer dereference: Unable to handle kernel NULL pointer dereference at virtual address 0000000000000000 ... Call trace: drm_bridge_attach+0x70/0x1a8 [drm] drm_aux_bridge_attach+0x24/0x38 [aux_bridge] drm_bridge_attach+0x80/0x1a8 [drm] dp_bridge_init+0xa8/0x15c [msm] msm_dp_modeset_init+0x28/0xc4 [msm] The DRM bridge implementation is clearly fragile and implicitly built on the assumption that bridges may never go away. In this case, the fix is to move the bridge registration in the pmic_glink_altmode driver to after all resources have been looked up. Incidentally, with the new dp-hpd bridge implementation, which registers child devices, this is also a requirement due to a long-standing issue in driver core that can otherwise lead to a probe deferral loop (see commit fbc35b4 ("Add documentation on meaning of -EPROBE_DEFER")). [DB: slightly fixed commit message by adding the word 'commit'] Fixes: 080b4e2 ("soc: qcom: pmic_glink: Introduce altmode support") Fixes: 2bcca96 ("soc: qcom: pmic-glink: switch to DRM_AUX_HPD_BRIDGE") Cc: <stable@vger.kernel.org> # 6.3 Cc: Bjorn Andersson <andersson@kernel.org> Cc: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Signed-off-by: Johan Hovold <johan+linaro@kernel.org> Reviewed-by: Bjorn Andersson <andersson@kernel.org> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Link: https://patchwork.freedesktop.org/patch/msgid/20240217150228.5788-4-johan+linaro@kernel.org
1 parent e5ca263 commit b979f2d

1 file changed

Lines changed: 13 additions & 3 deletions

File tree

drivers/soc/qcom/pmic_glink_altmode.c

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ struct pmic_glink_altmode_port {
7676

7777
struct work_struct work;
7878

79-
struct device *bridge;
79+
struct auxiliary_device *bridge;
8080

8181
enum typec_orientation orientation;
8282
u16 svid;
@@ -230,7 +230,7 @@ static void pmic_glink_altmode_worker(struct work_struct *work)
230230
else
231231
pmic_glink_altmode_enable_usb(altmode, alt_port);
232232

233-
drm_aux_hpd_bridge_notify(alt_port->bridge,
233+
drm_aux_hpd_bridge_notify(&alt_port->bridge->dev,
234234
alt_port->hpd_state ?
235235
connector_status_connected :
236236
connector_status_disconnected);
@@ -454,7 +454,7 @@ static int pmic_glink_altmode_probe(struct auxiliary_device *adev,
454454
alt_port->index = port;
455455
INIT_WORK(&alt_port->work, pmic_glink_altmode_worker);
456456

457-
alt_port->bridge = drm_dp_hpd_bridge_register(dev, to_of_node(fwnode));
457+
alt_port->bridge = devm_drm_dp_hpd_bridge_alloc(dev, to_of_node(fwnode));
458458
if (IS_ERR(alt_port->bridge)) {
459459
fwnode_handle_put(fwnode);
460460
return PTR_ERR(alt_port->bridge);
@@ -510,6 +510,16 @@ static int pmic_glink_altmode_probe(struct auxiliary_device *adev,
510510
}
511511
}
512512

513+
for (port = 0; port < ARRAY_SIZE(altmode->ports); port++) {
514+
alt_port = &altmode->ports[port];
515+
if (!alt_port->bridge)
516+
continue;
517+
518+
ret = devm_drm_dp_hpd_bridge_add(dev, alt_port->bridge);
519+
if (ret)
520+
return ret;
521+
}
522+
513523
altmode->client = devm_pmic_glink_register_client(dev,
514524
altmode->owner_id,
515525
pmic_glink_altmode_callback,

0 commit comments

Comments
 (0)