From ddee3b6732f42a52ee1c1716d7c85e05be5e05dd Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Sun, 10 Mar 2024 09:17:06 -0400 Subject: [PATCH] Drop drm-bridge-aux-hpd-separate-allocation-and-registrat.patch Signed-off-by: Sasha Levin --- ...pd-separate-allocation-and-registrat.patch | 175 ------------------ queue-6.6/series | 1 - ...pd-separate-allocation-and-registrat.patch | 175 ------------------ queue-6.7/series | 1 - 4 files changed, 352 deletions(-) delete mode 100644 queue-6.6/drm-bridge-aux-hpd-separate-allocation-and-registrat.patch delete mode 100644 queue-6.7/drm-bridge-aux-hpd-separate-allocation-and-registrat.patch diff --git a/queue-6.6/drm-bridge-aux-hpd-separate-allocation-and-registrat.patch b/queue-6.6/drm-bridge-aux-hpd-separate-allocation-and-registrat.patch deleted file mode 100644 index 8cce175bd1d..00000000000 --- a/queue-6.6/drm-bridge-aux-hpd-separate-allocation-and-registrat.patch +++ /dev/null @@ -1,175 +0,0 @@ -From 5987955d65715e06a13a72c145058466f3cf587a Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sat, 17 Feb 2024 16:02:24 +0100 -Subject: drm/bridge: aux-hpd: separate allocation and registration - -From: Johan Hovold - -[ Upstream commit e5ca263508f7e9d2cf711edf3258d11ca087885c ] - -Combining allocation and registration is an anti-pattern that should be -avoided. Add two new functions for allocating and registering an dp-hpd -bridge with a proper 'devm' prefix so that it is clear that these are -device managed interfaces. - - devm_drm_dp_hpd_bridge_alloc() - devm_drm_dp_hpd_bridge_add() - -The new interface will be used to fix a use-after-free bug in the -Qualcomm PMIC GLINK driver and may prevent similar issues from being -introduced elsewhere. - -The existing drm_dp_hpd_bridge_register() is reimplemented using the -above and left in place for now. - -Signed-off-by: Johan Hovold -Reviewed-by: Bjorn Andersson -Reviewed-by: Dmitry Baryshkov -Signed-off-by: Dmitry Baryshkov -Link: https://patchwork.freedesktop.org/patch/msgid/20240217150228.5788-3-johan+linaro@kernel.org -Stable-dep-of: b979f2d50a09 ("soc: qcom: pmic_glink_altmode: fix drm bridge use-after-free") -Signed-off-by: Sasha Levin ---- - drivers/gpu/drm/bridge/aux-hpd-bridge.c | 67 +++++++++++++++++++------ - include/drm/bridge/aux-bridge.h | 15 ++++++ - 2 files changed, 67 insertions(+), 15 deletions(-) - -diff --git a/drivers/gpu/drm/bridge/aux-hpd-bridge.c b/drivers/gpu/drm/bridge/aux-hpd-bridge.c -index 5d2ab3a715f9c..44bb771211b82 100644 ---- a/drivers/gpu/drm/bridge/aux-hpd-bridge.c -+++ b/drivers/gpu/drm/bridge/aux-hpd-bridge.c -@@ -29,16 +29,13 @@ static void drm_aux_hpd_bridge_release(struct device *dev) - kfree(adev); - } - --static void drm_aux_hpd_bridge_unregister_adev(void *_adev) -+static void drm_aux_hpd_bridge_free_adev(void *_adev) - { -- struct auxiliary_device *adev = _adev; -- -- auxiliary_device_delete(adev); -- auxiliary_device_uninit(adev); -+ auxiliary_device_uninit(_adev); - } - - /** -- * drm_dp_hpd_bridge_register - Create a simple HPD DisplayPort bridge -+ * devm_drm_dp_hpd_bridge_alloc - allocate a HPD DisplayPort bridge - * @parent: device instance providing this bridge - * @np: device node pointer corresponding to this bridge instance - * -@@ -46,11 +43,9 @@ static void drm_aux_hpd_bridge_unregister_adev(void *_adev) - * DRM_MODE_CONNECTOR_DisplayPort, which terminates the bridge chain and is - * able to send the HPD events. - * -- * Return: device instance that will handle created bridge or an error code -- * encoded into the pointer. -+ * Return: bridge auxiliary device pointer or an error pointer - */ --struct device *drm_dp_hpd_bridge_register(struct device *parent, -- struct device_node *np) -+struct auxiliary_device *devm_drm_dp_hpd_bridge_alloc(struct device *parent, struct device_node *np) - { - struct auxiliary_device *adev; - int ret; -@@ -79,13 +74,55 @@ struct device *drm_dp_hpd_bridge_register(struct device *parent, - return ERR_PTR(ret); - } - -- ret = auxiliary_device_add(adev); -- if (ret) { -- auxiliary_device_uninit(adev); -+ ret = devm_add_action_or_reset(parent, drm_aux_hpd_bridge_free_adev, adev); -+ if (ret) - return ERR_PTR(ret); -- } - -- ret = devm_add_action_or_reset(parent, drm_aux_hpd_bridge_unregister_adev, adev); -+ return adev; -+} -+EXPORT_SYMBOL_GPL(devm_drm_dp_hpd_bridge_alloc); -+ -+static void drm_aux_hpd_bridge_del_adev(void *_adev) -+{ -+ auxiliary_device_delete(_adev); -+} -+ -+/** -+ * devm_drm_dp_hpd_bridge_add - register a HDP DisplayPort bridge -+ * @dev: struct device to tie registration lifetime to -+ * @adev: bridge auxiliary device to be registered -+ * -+ * Returns: zero on success or a negative errno -+ */ -+int devm_drm_dp_hpd_bridge_add(struct device *dev, struct auxiliary_device *adev) -+{ -+ int ret; -+ -+ ret = auxiliary_device_add(adev); -+ if (ret) -+ return ret; -+ -+ return devm_add_action_or_reset(dev, drm_aux_hpd_bridge_del_adev, adev); -+} -+EXPORT_SYMBOL_GPL(devm_drm_dp_hpd_bridge_add); -+ -+/** -+ * drm_dp_hpd_bridge_register - allocate and register a HDP DisplayPort bridge -+ * @parent: device instance providing this bridge -+ * @np: device node pointer corresponding to this bridge instance -+ * -+ * Return: device instance that will handle created bridge or an error pointer -+ */ -+struct device *drm_dp_hpd_bridge_register(struct device *parent, struct device_node *np) -+{ -+ struct auxiliary_device *adev; -+ int ret; -+ -+ adev = devm_drm_dp_hpd_bridge_alloc(parent, np); -+ if (IS_ERR(adev)) -+ return ERR_CAST(adev); -+ -+ ret = devm_drm_dp_hpd_bridge_add(parent, adev); - if (ret) - return ERR_PTR(ret); - -diff --git a/include/drm/bridge/aux-bridge.h b/include/drm/bridge/aux-bridge.h -index 66249ff0858e7..874f177381e34 100644 ---- a/include/drm/bridge/aux-bridge.h -+++ b/include/drm/bridge/aux-bridge.h -@@ -9,6 +9,8 @@ - - #include - -+struct auxiliary_device; -+ - #if IS_ENABLED(CONFIG_DRM_AUX_BRIDGE) - int drm_aux_bridge_register(struct device *parent); - #else -@@ -19,10 +21,23 @@ static inline int drm_aux_bridge_register(struct device *parent) - #endif - - #if IS_ENABLED(CONFIG_DRM_AUX_HPD_BRIDGE) -+struct auxiliary_device *devm_drm_dp_hpd_bridge_alloc(struct device *parent, struct device_node *np); -+int devm_drm_dp_hpd_bridge_add(struct device *dev, struct auxiliary_device *adev); - struct device *drm_dp_hpd_bridge_register(struct device *parent, - struct device_node *np); - void drm_aux_hpd_bridge_notify(struct device *dev, enum drm_connector_status status); - #else -+static inline struct auxiliary_device *devm_drm_dp_hpd_bridge_alloc(struct device *parent, -+ struct device_node *np) -+{ -+ return NULL; -+} -+ -+static inline int devm_drm_dp_hpd_bridge_add(struct auxiliary_device *adev) -+{ -+ return 0; -+} -+ - static inline struct device *drm_dp_hpd_bridge_register(struct device *parent, - struct device_node *np) - { --- -2.43.0 - diff --git a/queue-6.6/series b/queue-6.6/series index 7d28bb76846..fa87bc7ba95 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -1,7 +1,6 @@ drm-bridge-add-transparent-bridge-helper.patch drm-bridge-implement-generic-dp-hpd-bridge.patch soc-qcom-pmic-glink-switch-to-drm_aux_hpd_bridge.patch -drm-bridge-aux-hpd-separate-allocation-and-registrat.patch dt-bindings-dma-fsl-edma-add-fsl-edma.h-to-prevent-h.patch dmaengine-fsl-edma-utilize-common-dt-binding-header-.patch dmaengine-fsl-edma-correct-max_segment_size-setting.patch diff --git a/queue-6.7/drm-bridge-aux-hpd-separate-allocation-and-registrat.patch b/queue-6.7/drm-bridge-aux-hpd-separate-allocation-and-registrat.patch deleted file mode 100644 index df23d7dd028..00000000000 --- a/queue-6.7/drm-bridge-aux-hpd-separate-allocation-and-registrat.patch +++ /dev/null @@ -1,175 +0,0 @@ -From 357c636cf7159761a5bf455bd7e68e1c884eaa60 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sat, 17 Feb 2024 16:02:24 +0100 -Subject: drm/bridge: aux-hpd: separate allocation and registration - -From: Johan Hovold - -[ Upstream commit e5ca263508f7e9d2cf711edf3258d11ca087885c ] - -Combining allocation and registration is an anti-pattern that should be -avoided. Add two new functions for allocating and registering an dp-hpd -bridge with a proper 'devm' prefix so that it is clear that these are -device managed interfaces. - - devm_drm_dp_hpd_bridge_alloc() - devm_drm_dp_hpd_bridge_add() - -The new interface will be used to fix a use-after-free bug in the -Qualcomm PMIC GLINK driver and may prevent similar issues from being -introduced elsewhere. - -The existing drm_dp_hpd_bridge_register() is reimplemented using the -above and left in place for now. - -Signed-off-by: Johan Hovold -Reviewed-by: Bjorn Andersson -Reviewed-by: Dmitry Baryshkov -Signed-off-by: Dmitry Baryshkov -Link: https://patchwork.freedesktop.org/patch/msgid/20240217150228.5788-3-johan+linaro@kernel.org -Stable-dep-of: b979f2d50a09 ("soc: qcom: pmic_glink_altmode: fix drm bridge use-after-free") -Signed-off-by: Sasha Levin ---- - drivers/gpu/drm/bridge/aux-hpd-bridge.c | 67 +++++++++++++++++++------ - include/drm/bridge/aux-bridge.h | 15 ++++++ - 2 files changed, 67 insertions(+), 15 deletions(-) - -diff --git a/drivers/gpu/drm/bridge/aux-hpd-bridge.c b/drivers/gpu/drm/bridge/aux-hpd-bridge.c -index 5d2ab3a715f9c..44bb771211b82 100644 ---- a/drivers/gpu/drm/bridge/aux-hpd-bridge.c -+++ b/drivers/gpu/drm/bridge/aux-hpd-bridge.c -@@ -29,16 +29,13 @@ static void drm_aux_hpd_bridge_release(struct device *dev) - kfree(adev); - } - --static void drm_aux_hpd_bridge_unregister_adev(void *_adev) -+static void drm_aux_hpd_bridge_free_adev(void *_adev) - { -- struct auxiliary_device *adev = _adev; -- -- auxiliary_device_delete(adev); -- auxiliary_device_uninit(adev); -+ auxiliary_device_uninit(_adev); - } - - /** -- * drm_dp_hpd_bridge_register - Create a simple HPD DisplayPort bridge -+ * devm_drm_dp_hpd_bridge_alloc - allocate a HPD DisplayPort bridge - * @parent: device instance providing this bridge - * @np: device node pointer corresponding to this bridge instance - * -@@ -46,11 +43,9 @@ static void drm_aux_hpd_bridge_unregister_adev(void *_adev) - * DRM_MODE_CONNECTOR_DisplayPort, which terminates the bridge chain and is - * able to send the HPD events. - * -- * Return: device instance that will handle created bridge or an error code -- * encoded into the pointer. -+ * Return: bridge auxiliary device pointer or an error pointer - */ --struct device *drm_dp_hpd_bridge_register(struct device *parent, -- struct device_node *np) -+struct auxiliary_device *devm_drm_dp_hpd_bridge_alloc(struct device *parent, struct device_node *np) - { - struct auxiliary_device *adev; - int ret; -@@ -79,13 +74,55 @@ struct device *drm_dp_hpd_bridge_register(struct device *parent, - return ERR_PTR(ret); - } - -- ret = auxiliary_device_add(adev); -- if (ret) { -- auxiliary_device_uninit(adev); -+ ret = devm_add_action_or_reset(parent, drm_aux_hpd_bridge_free_adev, adev); -+ if (ret) - return ERR_PTR(ret); -- } - -- ret = devm_add_action_or_reset(parent, drm_aux_hpd_bridge_unregister_adev, adev); -+ return adev; -+} -+EXPORT_SYMBOL_GPL(devm_drm_dp_hpd_bridge_alloc); -+ -+static void drm_aux_hpd_bridge_del_adev(void *_adev) -+{ -+ auxiliary_device_delete(_adev); -+} -+ -+/** -+ * devm_drm_dp_hpd_bridge_add - register a HDP DisplayPort bridge -+ * @dev: struct device to tie registration lifetime to -+ * @adev: bridge auxiliary device to be registered -+ * -+ * Returns: zero on success or a negative errno -+ */ -+int devm_drm_dp_hpd_bridge_add(struct device *dev, struct auxiliary_device *adev) -+{ -+ int ret; -+ -+ ret = auxiliary_device_add(adev); -+ if (ret) -+ return ret; -+ -+ return devm_add_action_or_reset(dev, drm_aux_hpd_bridge_del_adev, adev); -+} -+EXPORT_SYMBOL_GPL(devm_drm_dp_hpd_bridge_add); -+ -+/** -+ * drm_dp_hpd_bridge_register - allocate and register a HDP DisplayPort bridge -+ * @parent: device instance providing this bridge -+ * @np: device node pointer corresponding to this bridge instance -+ * -+ * Return: device instance that will handle created bridge or an error pointer -+ */ -+struct device *drm_dp_hpd_bridge_register(struct device *parent, struct device_node *np) -+{ -+ struct auxiliary_device *adev; -+ int ret; -+ -+ adev = devm_drm_dp_hpd_bridge_alloc(parent, np); -+ if (IS_ERR(adev)) -+ return ERR_CAST(adev); -+ -+ ret = devm_drm_dp_hpd_bridge_add(parent, adev); - if (ret) - return ERR_PTR(ret); - -diff --git a/include/drm/bridge/aux-bridge.h b/include/drm/bridge/aux-bridge.h -index 66249ff0858e7..874f177381e34 100644 ---- a/include/drm/bridge/aux-bridge.h -+++ b/include/drm/bridge/aux-bridge.h -@@ -9,6 +9,8 @@ - - #include - -+struct auxiliary_device; -+ - #if IS_ENABLED(CONFIG_DRM_AUX_BRIDGE) - int drm_aux_bridge_register(struct device *parent); - #else -@@ -19,10 +21,23 @@ static inline int drm_aux_bridge_register(struct device *parent) - #endif - - #if IS_ENABLED(CONFIG_DRM_AUX_HPD_BRIDGE) -+struct auxiliary_device *devm_drm_dp_hpd_bridge_alloc(struct device *parent, struct device_node *np); -+int devm_drm_dp_hpd_bridge_add(struct device *dev, struct auxiliary_device *adev); - struct device *drm_dp_hpd_bridge_register(struct device *parent, - struct device_node *np); - void drm_aux_hpd_bridge_notify(struct device *dev, enum drm_connector_status status); - #else -+static inline struct auxiliary_device *devm_drm_dp_hpd_bridge_alloc(struct device *parent, -+ struct device_node *np) -+{ -+ return NULL; -+} -+ -+static inline int devm_drm_dp_hpd_bridge_add(struct auxiliary_device *adev) -+{ -+ return 0; -+} -+ - static inline struct device *drm_dp_hpd_bridge_register(struct device *parent, - struct device_node *np) - { --- -2.43.0 - diff --git a/queue-6.7/series b/queue-6.7/series index 89bc660d616..21e1f1e4c59 100644 --- a/queue-6.7/series +++ b/queue-6.7/series @@ -1,7 +1,6 @@ drm-bridge-add-transparent-bridge-helper.patch drm-bridge-implement-generic-dp-hpd-bridge.patch soc-qcom-pmic-glink-switch-to-drm_aux_hpd_bridge.patch -drm-bridge-aux-hpd-separate-allocation-and-registrat.patch dt-bindings-dma-fsl-edma-add-fsl-edma.h-to-prevent-h.patch dmaengine-fsl-edma-utilize-common-dt-binding-header-.patch dmaengine-fsl-edma-correct-max_segment_size-setting.patch -- 2.47.2