Message ID | 20210712080736.116435-1-linux@fw-web.de (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | drm/mediatek: dpi: fix NULL dereference in mtk_dpi_bridge_atomic_check | expand |
On Mon, Jul 12, 2021 at 4:08 PM Frank Wunderlich <linux@fw-web.de> wrote: > > From: Frank Wunderlich <frank-w@public-files.de> > > bridge->driver_private is not set (NULL) so use bridge_to_dpi(bridge) > like it's done in bridge_atomic_get_output_bus_fmts > > Fixes: ec8747c52434 ("drm/mediatek: dpi: Add bus format negotiation") > Signed-off-by: Frank Wunderlich <frank-w@public-files.de> Tested-by: Hsin-Yi Wang <hsinyi@chromium.org> Tested on a mt8183 device. > --- > drivers/gpu/drm/mediatek/mtk_dpi.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c > index bced555648b0..a2eca1f66984 100644 > --- a/drivers/gpu/drm/mediatek/mtk_dpi.c > +++ b/drivers/gpu/drm/mediatek/mtk_dpi.c > @@ -605,7 +605,7 @@ static int mtk_dpi_bridge_atomic_check(struct drm_bridge *bridge, > struct drm_crtc_state *crtc_state, > struct drm_connector_state *conn_state) > { > - struct mtk_dpi *dpi = bridge->driver_private; > + struct mtk_dpi *dpi = bridge_to_dpi(bridge); > unsigned int out_bus_format; > > out_bus_format = bridge_state->output_bus_cfg.format; > -- > 2.25.1 > > > _______________________________________________ > Linux-mediatek mailing list > Linux-mediatek@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-mediatek
Hi, Frank: On Mon, 2021-07-12 at 10:07 +0200, Frank Wunderlich wrote: > From: Frank Wunderlich <frank-w@public-files.de> > > bridge->driver_private is not set (NULL) so use bridge_to_dpi(bridge) > like it's done in bridge_atomic_get_output_bus_fmts Reviewed-by: CK Hu <ck.hu@mediatek.com> > > Fixes: ec8747c52434 ("drm/mediatek: dpi: Add bus format negotiation") > Signed-off-by: Frank Wunderlich <frank-w@public-files.de> > --- > drivers/gpu/drm/mediatek/mtk_dpi.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c > index bced555648b0..a2eca1f66984 100644 > --- a/drivers/gpu/drm/mediatek/mtk_dpi.c > +++ b/drivers/gpu/drm/mediatek/mtk_dpi.c > @@ -605,7 +605,7 @@ static int mtk_dpi_bridge_atomic_check(struct drm_bridge *bridge, > struct drm_crtc_state *crtc_state, > struct drm_connector_state *conn_state) > { > - struct mtk_dpi *dpi = bridge->driver_private; > + struct mtk_dpi *dpi = bridge_to_dpi(bridge); > unsigned int out_bus_format; > > out_bus_format = bridge_state->output_bus_cfg.format;
Hi, Frank: Frank Wunderlich <linux@fw-web.de> 於 2021年7月12日 週一 下午4:08寫道: > > From: Frank Wunderlich <frank-w@public-files.de> > > bridge->driver_private is not set (NULL) so use bridge_to_dpi(bridge) > like it's done in bridge_atomic_get_output_bus_fmts Applied to mediatek-drm-fixes [1], thanks. [1] https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux.git/log/?h=mediatek-drm-fixes Regards, Chun-Kuang. > > Fixes: ec8747c52434 ("drm/mediatek: dpi: Add bus format negotiation") > Signed-off-by: Frank Wunderlich <frank-w@public-files.de> > --- > drivers/gpu/drm/mediatek/mtk_dpi.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c > index bced555648b0..a2eca1f66984 100644 > --- a/drivers/gpu/drm/mediatek/mtk_dpi.c > +++ b/drivers/gpu/drm/mediatek/mtk_dpi.c > @@ -605,7 +605,7 @@ static int mtk_dpi_bridge_atomic_check(struct drm_bridge *bridge, > struct drm_crtc_state *crtc_state, > struct drm_connector_state *conn_state) > { > - struct mtk_dpi *dpi = bridge->driver_private; > + struct mtk_dpi *dpi = bridge_to_dpi(bridge); > unsigned int out_bus_format; > > out_bus_format = bridge_state->output_bus_cfg.format; > -- > 2.25.1 > > > _______________________________________________ > Linux-mediatek mailing list > Linux-mediatek@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-mediatek
diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c index bced555648b0..a2eca1f66984 100644 --- a/drivers/gpu/drm/mediatek/mtk_dpi.c +++ b/drivers/gpu/drm/mediatek/mtk_dpi.c @@ -605,7 +605,7 @@ static int mtk_dpi_bridge_atomic_check(struct drm_bridge *bridge, struct drm_crtc_state *crtc_state, struct drm_connector_state *conn_state) { - struct mtk_dpi *dpi = bridge->driver_private; + struct mtk_dpi *dpi = bridge_to_dpi(bridge); unsigned int out_bus_format; out_bus_format = bridge_state->output_bus_cfg.format;