* [RESEND][PATCH] omapdrm: fix missing check on list iterator
@ 2022-04-14 6:14 Xiaomeng Tong
2022-04-14 8:32 ` Tomi Valkeinen
0 siblings, 1 reply; 2+ messages in thread
From: Xiaomeng Tong @ 2022-04-14 6:14 UTC (permalink / raw)
To: tomba, airlied, daniel; +Cc: stable, Xiaomeng Tong, linux-kernel, dri-devel
The bug is here:
bus_flags = connector->display_info.bus_flags;
The list iterator 'connector-' will point to a bogus position containing
HEAD if the list is empty or no element is found. This case must
be checked before any use of the iterator, otherwise it will lead
to a invalid memory access.
To fix this bug, add an check. Use a new value 'iter' as the list
iterator, while use the old value 'connector' as a dedicated variable
to point to the found element.
Cc: stable@vger.kernel.org
Fixes: ("drm/omap: Add support for drm_panel")
Signed-off-by: Xiaomeng Tong <xiam0nd.tong@gmail.com>
---
drivers/gpu/drm/omapdrm/omap_encoder.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/omapdrm/omap_encoder.c b/drivers/gpu/drm/omapdrm/omap_encoder.c
index 4dd05bc732da..d648ab4223b1 100644
--- a/drivers/gpu/drm/omapdrm/omap_encoder.c
+++ b/drivers/gpu/drm/omapdrm/omap_encoder.c
@@ -76,14 +76,16 @@ static void omap_encoder_mode_set(struct drm_encoder *encoder,
struct omap_encoder *omap_encoder = to_omap_encoder(encoder);
struct omap_dss_device *output = omap_encoder->output;
struct drm_device *dev = encoder->dev;
- struct drm_connector *connector;
+ struct drm_connector *connector = NULL, *iter;
struct drm_bridge *bridge;
struct videomode vm = { 0 };
u32 bus_flags;
- list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
- if (connector->encoder == encoder)
+ list_for_each_entry(iter, &dev->mode_config.connector_list, head) {
+ if (iter->encoder == encoder) {
+ connector = iter;
break;
+ }
}
drm_display_mode_to_videomode(adjusted_mode, &vm);
@@ -106,8 +108,10 @@ static void omap_encoder_mode_set(struct drm_encoder *encoder,
omap_encoder_update_videomode_flags(&vm, bus_flags);
}
- bus_flags = connector->display_info.bus_flags;
- omap_encoder_update_videomode_flags(&vm, bus_flags);
+ if (connector) {
+ bus_flags = connector->display_info.bus_flags;
+ omap_encoder_update_videomode_flags(&vm, bus_flags);
+ }
/* Set timings for all devices in the display pipeline. */
dss_mgr_set_timings(output, &vm);
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [RESEND][PATCH] omapdrm: fix missing check on list iterator
2022-04-14 6:14 [RESEND][PATCH] omapdrm: fix missing check on list iterator Xiaomeng Tong
@ 2022-04-14 8:32 ` Tomi Valkeinen
0 siblings, 0 replies; 2+ messages in thread
From: Tomi Valkeinen @ 2022-04-14 8:32 UTC (permalink / raw)
To: Xiaomeng Tong, airlied, daniel; +Cc: stable, linux-kernel, dri-devel
Hi,
On 14/04/2022 09:14, Xiaomeng Tong wrote:
> The bug is here:
> bus_flags = connector->display_info.bus_flags;
>
> The list iterator 'connector-' will point to a bogus position containing
> HEAD if the list is empty or no element is found. This case must
> be checked before any use of the iterator, otherwise it will lead
> to a invalid memory access.
>
> To fix this bug, add an check. Use a new value 'iter' as the list
> iterator, while use the old value 'connector' as a dedicated variable
> to point to the found element.
>
> Cc: stable@vger.kernel.org
> Fixes: ("drm/omap: Add support for drm_panel")
> Signed-off-by: Xiaomeng Tong <xiam0nd.tong@gmail.com>
> ---
> drivers/gpu/drm/omapdrm/omap_encoder.c | 14 +++++++++-----
> 1 file changed, 9 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/omapdrm/omap_encoder.c b/drivers/gpu/drm/omapdrm/omap_encoder.c
> index 4dd05bc732da..d648ab4223b1 100644
> --- a/drivers/gpu/drm/omapdrm/omap_encoder.c
> +++ b/drivers/gpu/drm/omapdrm/omap_encoder.c
> @@ -76,14 +76,16 @@ static void omap_encoder_mode_set(struct drm_encoder *encoder,
> struct omap_encoder *omap_encoder = to_omap_encoder(encoder);
> struct omap_dss_device *output = omap_encoder->output;
> struct drm_device *dev = encoder->dev;
> - struct drm_connector *connector;
> + struct drm_connector *connector = NULL, *iter;
> struct drm_bridge *bridge;
> struct videomode vm = { 0 };
> u32 bus_flags;
>
> - list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
> - if (connector->encoder == encoder)
> + list_for_each_entry(iter, &dev->mode_config.connector_list, head) {
> + if (iter->encoder == encoder) {
> + connector = iter;
> break;
> + }
> }
When does this bug happen? How do you get omap_encoder_mode_set() called
for an encoder with a connector that is not valid?
>
> drm_display_mode_to_videomode(adjusted_mode, &vm);
> @@ -106,8 +108,10 @@ static void omap_encoder_mode_set(struct drm_encoder *encoder,
> omap_encoder_update_videomode_flags(&vm, bus_flags);
> }
>
> - bus_flags = connector->display_info.bus_flags;
> - omap_encoder_update_videomode_flags(&vm, bus_flags);
> + if (connector) {
> + bus_flags = connector->display_info.bus_flags;
> + omap_encoder_update_videomode_flags(&vm, bus_flags);
> + }
>
> /* Set timings for all devices in the display pipeline. */
> dss_mgr_set_timings(output, &vm);
How does this fix the issue? You just skip the lines that set up the
videomode, but then pass that videomode to dss_mgr_set_timings()...
Tomi
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-04-14 8:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-14 6:14 [RESEND][PATCH] omapdrm: fix missing check on list iterator Xiaomeng Tong
2022-04-14 8:32 ` Tomi Valkeinen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).