* [PATCH] video: fbdev: atmel_lcdfb: fix display-timings lookup @ 2017-11-13 10:27 ` Johan Hovold 0 siblings, 0 replies; 5+ messages in thread From: Johan Hovold @ 2017-11-13 10:27 UTC (permalink / raw) To: Nicolas Ferre Cc: Bartlomiej Zolnierkiewicz, Alexandre Belloni, linux-fbdev, dri-devel, linux-kernel, Johan Hovold, stable, Jean-Christophe PLAGNIOL-VILLARD Fix child-node lookup during probe, which ended up searching the whole device tree depth-first starting at the parent rather than just matching on its children. To make things worse, the parent display node was also prematurely freed. Note that the display and timings node references are never put after a successful dt-initialisation so the nodes would leak on later probe deferrals and on driver unbind. Fixes: b985172b328a ("video: atmel_lcdfb: add device tree suport") Cc: stable <stable@vger.kernel.org> # 3.13 Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Johan Hovold <johan@kernel.org> --- drivers/video/fbdev/atmel_lcdfb.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/video/fbdev/atmel_lcdfb.c b/drivers/video/fbdev/atmel_lcdfb.c index e06358da4b99..3dee267d7c75 100644 --- a/drivers/video/fbdev/atmel_lcdfb.c +++ b/drivers/video/fbdev/atmel_lcdfb.c @@ -1119,7 +1119,7 @@ static int atmel_lcdfb_of_init(struct atmel_lcdfb_info *sinfo) goto put_display_node; } - timings_np = of_find_node_by_name(display_np, "display-timings"); + timings_np = of_get_child_by_name(display_np, "display-timings"); if (!timings_np) { dev_err(dev, "failed to find display-timings node\n"); ret = -ENODEV; @@ -1140,6 +1140,12 @@ static int atmel_lcdfb_of_init(struct atmel_lcdfb_info *sinfo) fb_add_videomode(&fb_vm, &info->modelist); } + /* + * FIXME: Make sure we are not referencing any fields in display_np + * and timings_np and drop our references to them before returning to + * avoid leaking the nodes on probe deferral and driver unbind. + */ + return 0; put_timings_node: -- 2.15.0 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH] video: fbdev: atmel_lcdfb: fix display-timings lookup @ 2017-11-13 10:27 ` Johan Hovold 0 siblings, 0 replies; 5+ messages in thread From: Johan Hovold @ 2017-11-13 10:27 UTC (permalink / raw) To: Nicolas Ferre Cc: Bartlomiej Zolnierkiewicz, Alexandre Belloni, linux-fbdev, dri-devel, linux-kernel, Johan Hovold, stable, Jean-Christophe PLAGNIOL-VILLARD Fix child-node lookup during probe, which ended up searching the whole device tree depth-first starting at the parent rather than just matching on its children. To make things worse, the parent display node was also prematurely freed. Note that the display and timings node references are never put after a successful dt-initialisation so the nodes would leak on later probe deferrals and on driver unbind. Fixes: b985172b328a ("video: atmel_lcdfb: add device tree suport") Cc: stable <stable@vger.kernel.org> # 3.13 Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Johan Hovold <johan@kernel.org> --- drivers/video/fbdev/atmel_lcdfb.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/video/fbdev/atmel_lcdfb.c b/drivers/video/fbdev/atmel_lcdfb.c index e06358da4b99..3dee267d7c75 100644 --- a/drivers/video/fbdev/atmel_lcdfb.c +++ b/drivers/video/fbdev/atmel_lcdfb.c @@ -1119,7 +1119,7 @@ static int atmel_lcdfb_of_init(struct atmel_lcdfb_info *sinfo) goto put_display_node; } - timings_np = of_find_node_by_name(display_np, "display-timings"); + timings_np = of_get_child_by_name(display_np, "display-timings"); if (!timings_np) { dev_err(dev, "failed to find display-timings node\n"); ret = -ENODEV; @@ -1140,6 +1140,12 @@ static int atmel_lcdfb_of_init(struct atmel_lcdfb_info *sinfo) fb_add_videomode(&fb_vm, &info->modelist); } + /* + * FIXME: Make sure we are not referencing any fields in display_np + * and timings_np and drop our references to them before returning to + * avoid leaking the nodes on probe deferral and driver unbind. + */ + return 0; put_timings_node: -- 2.15.0 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] video: fbdev: atmel_lcdfb: fix display-timings lookup 2017-11-13 10:27 ` Johan Hovold (?) @ 2017-12-29 17:23 ` Bartlomiej Zolnierkiewicz -1 siblings, 0 replies; 5+ messages in thread From: Bartlomiej Zolnierkiewicz @ 2017-12-29 17:23 UTC (permalink / raw) To: Johan Hovold Cc: linux-fbdev, Nicolas Ferre, stable, linux-kernel, Alexandre Belloni, dri-devel, Jean-Christophe PLAGNIOL-VILLARD On Monday, November 13, 2017 11:27:19 AM Johan Hovold wrote: > Fix child-node lookup during probe, which ended up searching the whole > device tree depth-first starting at the parent rather than just matching > on its children. > > To make things worse, the parent display node was also prematurely > freed. > > Note that the display and timings node references are never put after a > successful dt-initialisation so the nodes would leak on later probe > deferrals and on driver unbind. > > Fixes: b985172b328a ("video: atmel_lcdfb: add device tree suport") > Cc: stable <stable@vger.kernel.org> # 3.13 > Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> > Signed-off-by: Johan Hovold <johan@kernel.org> Patch queued for 4.16, thanks. Best regards, -- Bartlomiej Zolnierkiewicz Samsung R&D Institute Poland Samsung Electronics ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] video: fbdev: atmel_lcdfb: fix display-timings lookup @ 2017-12-29 17:23 ` Bartlomiej Zolnierkiewicz 0 siblings, 0 replies; 5+ messages in thread From: Bartlomiej Zolnierkiewicz @ 2017-12-29 17:23 UTC (permalink / raw) To: Johan Hovold Cc: Nicolas Ferre, Alexandre Belloni, linux-fbdev, dri-devel, linux-kernel, stable, Jean-Christophe PLAGNIOL-VILLARD On Monday, November 13, 2017 11:27:19 AM Johan Hovold wrote: > Fix child-node lookup during probe, which ended up searching the whole > device tree depth-first starting at the parent rather than just matching > on its children. > > To make things worse, the parent display node was also prematurely > freed. > > Note that the display and timings node references are never put after a > successful dt-initialisation so the nodes would leak on later probe > deferrals and on driver unbind. > > Fixes: b985172b328a ("video: atmel_lcdfb: add device tree suport") > Cc: stable <stable@vger.kernel.org> # 3.13 > Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> > Signed-off-by: Johan Hovold <johan@kernel.org> Patch queued for 4.16, thanks. Best regards, -- Bartlomiej Zolnierkiewicz Samsung R&D Institute Poland Samsung Electronics ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] video: fbdev: atmel_lcdfb: fix display-timings lookup @ 2017-12-29 17:23 ` Bartlomiej Zolnierkiewicz 0 siblings, 0 replies; 5+ messages in thread From: Bartlomiej Zolnierkiewicz @ 2017-12-29 17:23 UTC (permalink / raw) To: Johan Hovold Cc: linux-fbdev, Nicolas Ferre, stable, linux-kernel, Alexandre Belloni, dri-devel, Jean-Christophe PLAGNIOL-VILLARD On Monday, November 13, 2017 11:27:19 AM Johan Hovold wrote: > Fix child-node lookup during probe, which ended up searching the whole > device tree depth-first starting at the parent rather than just matching > on its children. > > To make things worse, the parent display node was also prematurely > freed. > > Note that the display and timings node references are never put after a > successful dt-initialisation so the nodes would leak on later probe > deferrals and on driver unbind. > > Fixes: b985172b328a ("video: atmel_lcdfb: add device tree suport") > Cc: stable <stable@vger.kernel.org> # 3.13 > Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> > Signed-off-by: Johan Hovold <johan@kernel.org> Patch queued for 4.16, thanks. Best regards, -- Bartlomiej Zolnierkiewicz Samsung R&D Institute Poland Samsung Electronics _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-12-29 17:23 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <CGME20171113102758epcas2p433e3d361b93e9030ffe53a2c65268d38@epcas2p4.samsung.com>
2017-11-13 10:27 ` [PATCH] video: fbdev: atmel_lcdfb: fix display-timings lookup Johan Hovold
2017-11-13 10:27 ` Johan Hovold
2017-12-29 17:23 ` Bartlomiej Zolnierkiewicz
2017-12-29 17:23 ` Bartlomiej Zolnierkiewicz
2017-12-29 17:23 ` Bartlomiej Zolnierkiewicz
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.