March 2023 - Linux-stable-mirror

[PATCH 4.19 0/1] tun: avoid double free in tun_free_netdev

by Dragos-Marian Panait

The following commit is needed to fix CVE-2022-4744: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?… George Kennedy (1): tun: avoid double free in tun_free_netdev drivers/net/tun.c | 109 +++++++++++++++++++++++++--------------------- 1 file changed, 59 insertions(+), 50 deletions(-) base-commit: 30baa0923a27fb9a04444a29562344e0573992e4 -- 2.39.1

1 year, 8 months

1
1
0 0

[PATCH 07/10] drm/msm: fix missing wq allocation error handling

by Johan Hovold

Add the missing sanity check to handle workqueue allocation failures. Fixes: c8afe684c95c ("drm/msm: basic KMS driver for snapdragon") Cc: stable(a)vger.kernel.org # 3.12 Cc: Rob Clark <robdclark(a)gmail.com> Signed-off-by: Johan Hovold <johan+linaro(a)kernel.org> --- drivers/gpu/drm/msm/msm_drv.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index 41cc6cd690cd..ac3b77dbfacc 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -432,6 +432,10 @@ static int msm_drm_init(struct device *dev, const struct drm_driver *drv) priv->dev = ddev; priv->wq = alloc_ordered_workqueue("msm", 0); + if (!priv->wq) { + ret = -ENOMEM; + goto err_put_dev; + } INIT_LIST_HEAD(&priv->objects); mutex_init(&priv->obj_lock); -- 2.39.2

1 year, 8 months

2
1
0 0

Re: Patch "sched/fair: sanitize vruntime of entity being placed" has been added to the 4.14-stable tree

by Zhang Qiao

在 2023/3/5 12:02, Sasha Levin 写道: > This is a note to let you know that I've just added the patch titled > > sched/fair: sanitize vruntime of entity being placed > > to the 4.14-stable tree which can be found at: > http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=sum… > > The filename of the patch is: > sched-fair-sanitize-vruntime-of-entity-being-placed.patch > and it can be found in the queue-4.14 subdirectory. > > If you, or anyone else, feels it should not be added to the stable tree, > please let <stable(a)vger.kernel.org> know about it. > > > > commit 38247e1de3305a6ef644404ac818bc6129440eae Hi, This patch has significant impact on the hackbench.throughput [1]. Please don't backport this patch. [1] https://lore.kernel.org/lkml/202302211553.9738f304-yujie.liu@intel.com/T/#u Thanks. Zhang Qiao. > Author: Zhang Qiao <zhangqiao22(a)huawei.com> > Date: Mon Jan 30 13:22:16 2023 +0100 > > sched/fair: sanitize vruntime of entity being placed > > [ Upstream commit 829c1651e9c4a6f78398d3e67651cef9bb6b42cc ] > > When a scheduling entity is placed onto cfs_rq, its vruntime is pulled > to the base level (around cfs_rq->min_vruntime), so that the entity > doesn't gain extra boost when placed backwards. > > However, if the entity being placed wasn't executed for a long time, its > vruntime may get too far behind (e.g. while cfs_rq was executing a > low-weight hog), which can inverse the vruntime comparison due to s64 > overflow. This results in the entity being placed with its original > vruntime way forwards, so that it will effectively never get to the cpu. > > To prevent that, ignore the vruntime of the entity being placed if it > didn't execute for much longer than the characteristic sheduler time > scale. > > [rkagan: formatted, adjusted commit log, comments, cutoff value] > Signed-off-by: Zhang Qiao <zhangqiao22(a)huawei.com> > Co-developed-by: Roman Kagan <rkagan(a)amazon.de> > Signed-off-by: Roman Kagan <rkagan(a)amazon.de> > Signed-off-by: Peter Zijlstra (Intel) <peterz(a)infradead.org> > Link: https://lkml.kernel.org/r/20230130122216.3555094-1-rkagan@amazon.de > Signed-off-by: Sasha Levin <sashal(a)kernel.org> > > diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c > index 3ff60230710c9..afa21e43477fa 100644 > --- a/kernel/sched/fair.c > +++ b/kernel/sched/fair.c > @@ -3615,6 +3615,7 @@ static void > place_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int initial) > { > u64 vruntime = cfs_rq->min_vruntime; > + u64 sleep_time; > > /* > * The 'current' period is already promised to the current tasks, > @@ -3639,8 +3640,18 @@ place_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int initial) > vruntime -= thresh; > } > > - /* ensure we never gain time by being placed backwards. */ > - se->vruntime = max_vruntime(se->vruntime, vruntime); > + /* > + * Pull vruntime of the entity being placed to the base level of > + * cfs_rq, to prevent boosting it if placed backwards. If the entity > + * slept for a long time, don't even try to compare its vruntime with > + * the base as it may be too far off and the comparison may get > + * inversed due to s64 overflow. > + */ > + sleep_time = rq_clock_task(rq_of(cfs_rq)) - se->exec_start; > + if ((s64)sleep_time > 60LL * NSEC_PER_SEC) > + se->vruntime = vruntime; > + else > + se->vruntime = max_vruntime(se->vruntime, vruntime); > } > > static void check_enqueue_throttle(struct cfs_rq *cfs_rq); > . >

1 year, 8 months

2
7
0 0

FAILED: patch "[PATCH] dm crypt: avoid accessing uninitialized tasklet" failed to apply to 5.10-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.10-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y git checkout FETCH_HEAD git cherry-pick -x d9a02e016aaf5a57fb44e9a5e6da8ccd3b9e2e70 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '168000726237133(a)kroah.com' --subject-prefix 'PATCH 5.10.y' HEAD^.. Possible dependencies: d9a02e016aaf ("dm crypt: avoid accessing uninitialized tasklet") d3703ef33129 ("dm crypt: use in_hardirq() instead of deprecated in_irq()") c87a95dc28b1 ("dm crypt: defer decryption to a tasklet if interrupts disabled") 8e14f610159d ("dm crypt: do not call bio_endio() from the dm-crypt tasklet") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From d9a02e016aaf5a57fb44e9a5e6da8ccd3b9e2e70 Mon Sep 17 00:00:00 2001 From: Mike Snitzer <snitzer(a)kernel.org> Date: Wed, 8 Mar 2023 14:39:54 -0500 Subject: [PATCH] dm crypt: avoid accessing uninitialized tasklet When neither "no_read_workqueue" nor "no_write_workqueue" are enabled, tasklet_trylock() in crypt_dec_pending() may still return false due to an uninitialized state, and dm-crypt will unnecessarily do io completion in io_queue workqueue instead of current context. Fix this by adding an 'in_tasklet' flag to dm_crypt_io struct and initialize it to false in crypt_io_init(). Set this flag to true in kcryptd_queue_crypt() before calling tasklet_schedule(). If set crypt_dec_pending() will punt io completion to a workqueue. This also nicely avoids the tasklet_trylock/unlock hack when tasklets aren't in use. Fixes: 8e14f610159d ("dm crypt: do not call bio_endio() from the dm-crypt tasklet") Cc: stable(a)vger.kernel.org Reported-by: Hou Tao <houtao1(a)huawei.com> Suggested-by: Ignat Korchagin <ignat(a)cloudflare.com> Reviewed-by: Ignat Korchagin <ignat(a)cloudflare.com> Signed-off-by: Mike Snitzer <snitzer(a)kernel.org> diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c index faba1be572f9..2764b4ea18a3 100644 --- a/drivers/md/dm-crypt.c +++ b/drivers/md/dm-crypt.c @@ -72,7 +72,9 @@ struct dm_crypt_io { struct crypt_config *cc; struct bio *base_bio; u8 *integrity_metadata; - bool integrity_metadata_from_pool; + bool integrity_metadata_from_pool:1; + bool in_tasklet:1; + struct work_struct work; struct tasklet_struct tasklet; @@ -1731,6 +1733,7 @@ static void crypt_io_init(struct dm_crypt_io *io, struct crypt_config *cc, io->ctx.r.req = NULL; io->integrity_metadata = NULL; io->integrity_metadata_from_pool = false; + io->in_tasklet = false; atomic_set(&io->io_pending, 0); } @@ -1777,14 +1780,13 @@ static void crypt_dec_pending(struct dm_crypt_io *io) * our tasklet. In this case we need to delay bio_endio() * execution to after the tasklet is done and dequeued. */ - if (tasklet_trylock(&io->tasklet)) { - tasklet_unlock(&io->tasklet); - bio_endio(base_bio); + if (io->in_tasklet) { + INIT_WORK(&io->work, kcryptd_io_bio_endio); + queue_work(cc->io_queue, &io->work); return; } - INIT_WORK(&io->work, kcryptd_io_bio_endio); - queue_work(cc->io_queue, &io->work); + bio_endio(base_bio); } /* @@ -2233,6 +2235,7 @@ static void kcryptd_queue_crypt(struct dm_crypt_io *io) * it is being executed with irqs disabled. */ if (in_hardirq() || irqs_disabled()) { + io->in_tasklet = true; tasklet_init(&io->tasklet, kcryptd_crypt_tasklet, (unsigned long)&io->work); tasklet_schedule(&io->tasklet); return;

1 year, 8 months

1
0
0 0

FAILED: patch "[PATCH] bus: imx-weim: fix branch condition evaluates to a garbage" failed to apply to 4.14-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.14-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-4.14.y git checkout FETCH_HEAD git cherry-pick -x 1adab2922c58e7ff4fa9f0b43695079402cce876 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '1680007196183163(a)kroah.com' --subject-prefix 'PATCH 4.14.y' HEAD^.. Possible dependencies: 1adab2922c58 ("bus: imx-weim: fix branch condition evaluates to a garbage value") e6cb5408289f ("bus: imx-weim: add DT overlay support for WEIM bus") 3b1261fb72c7 ("bus: imx-weim: remove incorrect __init annotations") 4a92f07816ba ("bus: imx-weim: use module_platform_driver()") 77266e722fea ("bus: imx-weim: optionally enable burst clock mode") c7995bcb36ef ("bus: imx-weim: guard against timing configuration conflicts") 8b8cb52af34d ("bus: imx-weim: support multiple address ranges per child node") b1a23445364d ("bus: imx-weim: drop unnecessary DT node name NULL check") d8dfa59f5a51 ("bus: imx-weim: Remove VLA usage") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 1adab2922c58e7ff4fa9f0b43695079402cce876 Mon Sep 17 00:00:00 2001 From: Ivan Bornyakov <i.bornyakov(a)metrotek.ru> Date: Mon, 6 Mar 2023 16:25:26 +0300 Subject: [PATCH] bus: imx-weim: fix branch condition evaluates to a garbage value If bus type is other than imx50_weim_devtype and have no child devices, variable 'ret' in function weim_parse_dt() will not be initialized, but will be used as branch condition and return value. Fix this by initializing 'ret' with 0. This was discovered with help of clang-analyzer, but the situation is quite possible in real life. Fixes: 52c47b63412b ("bus: imx-weim: improve error handling upon child probe-failure") Signed-off-by: Ivan Bornyakov <i.bornyakov(a)metrotek.ru> Cc: stable(a)vger.kernel.org Reviewed-by: Fabio Estevam <festevam(a)gmail.com> Signed-off-by: Shawn Guo <shawnguo(a)kernel.org> diff --git a/drivers/bus/imx-weim.c b/drivers/bus/imx-weim.c index 2a6b4f676458..36d42484142a 100644 --- a/drivers/bus/imx-weim.c +++ b/drivers/bus/imx-weim.c @@ -204,8 +204,8 @@ static int weim_parse_dt(struct platform_device *pdev) const struct of_device_id *of_id = of_match_device(weim_id_table, &pdev->dev); const struct imx_weim_devtype *devtype = of_id->data; + int ret = 0, have_child = 0; struct device_node *child; - int ret, have_child = 0; struct weim_priv *priv; void __iomem *base; u32 reg;

1 year, 8 months

1
0
0 0

FAILED: patch "[PATCH] bus: imx-weim: fix branch condition evaluates to a garbage" failed to apply to 5.4-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.4.y git checkout FETCH_HEAD git cherry-pick -x 1adab2922c58e7ff4fa9f0b43695079402cce876 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '1680007195157101(a)kroah.com' --subject-prefix 'PATCH 5.4.y' HEAD^.. Possible dependencies: 1adab2922c58 ("bus: imx-weim: fix branch condition evaluates to a garbage value") e6cb5408289f ("bus: imx-weim: add DT overlay support for WEIM bus") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 1adab2922c58e7ff4fa9f0b43695079402cce876 Mon Sep 17 00:00:00 2001 From: Ivan Bornyakov <i.bornyakov(a)metrotek.ru> Date: Mon, 6 Mar 2023 16:25:26 +0300 Subject: [PATCH] bus: imx-weim: fix branch condition evaluates to a garbage value If bus type is other than imx50_weim_devtype and have no child devices, variable 'ret' in function weim_parse_dt() will not be initialized, but will be used as branch condition and return value. Fix this by initializing 'ret' with 0. This was discovered with help of clang-analyzer, but the situation is quite possible in real life. Fixes: 52c47b63412b ("bus: imx-weim: improve error handling upon child probe-failure") Signed-off-by: Ivan Bornyakov <i.bornyakov(a)metrotek.ru> Cc: stable(a)vger.kernel.org Reviewed-by: Fabio Estevam <festevam(a)gmail.com> Signed-off-by: Shawn Guo <shawnguo(a)kernel.org> diff --git a/drivers/bus/imx-weim.c b/drivers/bus/imx-weim.c index 2a6b4f676458..36d42484142a 100644 --- a/drivers/bus/imx-weim.c +++ b/drivers/bus/imx-weim.c @@ -204,8 +204,8 @@ static int weim_parse_dt(struct platform_device *pdev) const struct of_device_id *of_id = of_match_device(weim_id_table, &pdev->dev); const struct imx_weim_devtype *devtype = of_id->data; + int ret = 0, have_child = 0; struct device_node *child; - int ret, have_child = 0; struct weim_priv *priv; void __iomem *base; u32 reg;

1 year, 8 months

1
0
0 0

FAILED: patch "[PATCH] bus: imx-weim: fix branch condition evaluates to a garbage" failed to apply to 4.19-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.19-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-4.19.y git checkout FETCH_HEAD git cherry-pick -x 1adab2922c58e7ff4fa9f0b43695079402cce876 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '16800071954128(a)kroah.com' --subject-prefix 'PATCH 4.19.y' HEAD^.. Possible dependencies: 1adab2922c58 ("bus: imx-weim: fix branch condition evaluates to a garbage value") e6cb5408289f ("bus: imx-weim: add DT overlay support for WEIM bus") 3b1261fb72c7 ("bus: imx-weim: remove incorrect __init annotations") 4a92f07816ba ("bus: imx-weim: use module_platform_driver()") 77266e722fea ("bus: imx-weim: optionally enable burst clock mode") c7995bcb36ef ("bus: imx-weim: guard against timing configuration conflicts") 8b8cb52af34d ("bus: imx-weim: support multiple address ranges per child node") b1a23445364d ("bus: imx-weim: drop unnecessary DT node name NULL check") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 1adab2922c58e7ff4fa9f0b43695079402cce876 Mon Sep 17 00:00:00 2001 From: Ivan Bornyakov <i.bornyakov(a)metrotek.ru> Date: Mon, 6 Mar 2023 16:25:26 +0300 Subject: [PATCH] bus: imx-weim: fix branch condition evaluates to a garbage value If bus type is other than imx50_weim_devtype and have no child devices, variable 'ret' in function weim_parse_dt() will not be initialized, but will be used as branch condition and return value. Fix this by initializing 'ret' with 0. This was discovered with help of clang-analyzer, but the situation is quite possible in real life. Fixes: 52c47b63412b ("bus: imx-weim: improve error handling upon child probe-failure") Signed-off-by: Ivan Bornyakov <i.bornyakov(a)metrotek.ru> Cc: stable(a)vger.kernel.org Reviewed-by: Fabio Estevam <festevam(a)gmail.com> Signed-off-by: Shawn Guo <shawnguo(a)kernel.org> diff --git a/drivers/bus/imx-weim.c b/drivers/bus/imx-weim.c index 2a6b4f676458..36d42484142a 100644 --- a/drivers/bus/imx-weim.c +++ b/drivers/bus/imx-weim.c @@ -204,8 +204,8 @@ static int weim_parse_dt(struct platform_device *pdev) const struct of_device_id *of_id = of_match_device(weim_id_table, &pdev->dev); const struct imx_weim_devtype *devtype = of_id->data; + int ret = 0, have_child = 0; struct device_node *child; - int ret, have_child = 0; struct weim_priv *priv; void __iomem *base; u32 reg;

1 year, 8 months

1
0
0 0

FAILED: patch "[PATCH] bus: imx-weim: fix branch condition evaluates to a garbage" failed to apply to 5.10-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.10-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y git checkout FETCH_HEAD git cherry-pick -x 1adab2922c58e7ff4fa9f0b43695079402cce876 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '168000719457118(a)kroah.com' --subject-prefix 'PATCH 5.10.y' HEAD^.. Possible dependencies: 1adab2922c58 ("bus: imx-weim: fix branch condition evaluates to a garbage value") e6cb5408289f ("bus: imx-weim: add DT overlay support for WEIM bus") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 1adab2922c58e7ff4fa9f0b43695079402cce876 Mon Sep 17 00:00:00 2001 From: Ivan Bornyakov <i.bornyakov(a)metrotek.ru> Date: Mon, 6 Mar 2023 16:25:26 +0300 Subject: [PATCH] bus: imx-weim: fix branch condition evaluates to a garbage value If bus type is other than imx50_weim_devtype and have no child devices, variable 'ret' in function weim_parse_dt() will not be initialized, but will be used as branch condition and return value. Fix this by initializing 'ret' with 0. This was discovered with help of clang-analyzer, but the situation is quite possible in real life. Fixes: 52c47b63412b ("bus: imx-weim: improve error handling upon child probe-failure") Signed-off-by: Ivan Bornyakov <i.bornyakov(a)metrotek.ru> Cc: stable(a)vger.kernel.org Reviewed-by: Fabio Estevam <festevam(a)gmail.com> Signed-off-by: Shawn Guo <shawnguo(a)kernel.org> diff --git a/drivers/bus/imx-weim.c b/drivers/bus/imx-weim.c index 2a6b4f676458..36d42484142a 100644 --- a/drivers/bus/imx-weim.c +++ b/drivers/bus/imx-weim.c @@ -204,8 +204,8 @@ static int weim_parse_dt(struct platform_device *pdev) const struct of_device_id *of_id = of_match_device(weim_id_table, &pdev->dev); const struct imx_weim_devtype *devtype = of_id->data; + int ret = 0, have_child = 0; struct device_node *child; - int ret, have_child = 0; struct weim_priv *priv; void __iomem *base; u32 reg;

1 year, 8 months

1
0
0 0

FAILED: patch "[PATCH] bus: imx-weim: fix branch condition evaluates to a garbage" failed to apply to 5.15-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.15-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y git checkout FETCH_HEAD git cherry-pick -x 1adab2922c58e7ff4fa9f0b43695079402cce876 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '16800071933593(a)kroah.com' --subject-prefix 'PATCH 5.15.y' HEAD^.. Possible dependencies: 1adab2922c58 ("bus: imx-weim: fix branch condition evaluates to a garbage value") e6cb5408289f ("bus: imx-weim: add DT overlay support for WEIM bus") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 1adab2922c58e7ff4fa9f0b43695079402cce876 Mon Sep 17 00:00:00 2001 From: Ivan Bornyakov <i.bornyakov(a)metrotek.ru> Date: Mon, 6 Mar 2023 16:25:26 +0300 Subject: [PATCH] bus: imx-weim: fix branch condition evaluates to a garbage value If bus type is other than imx50_weim_devtype and have no child devices, variable 'ret' in function weim_parse_dt() will not be initialized, but will be used as branch condition and return value. Fix this by initializing 'ret' with 0. This was discovered with help of clang-analyzer, but the situation is quite possible in real life. Fixes: 52c47b63412b ("bus: imx-weim: improve error handling upon child probe-failure") Signed-off-by: Ivan Bornyakov <i.bornyakov(a)metrotek.ru> Cc: stable(a)vger.kernel.org Reviewed-by: Fabio Estevam <festevam(a)gmail.com> Signed-off-by: Shawn Guo <shawnguo(a)kernel.org> diff --git a/drivers/bus/imx-weim.c b/drivers/bus/imx-weim.c index 2a6b4f676458..36d42484142a 100644 --- a/drivers/bus/imx-weim.c +++ b/drivers/bus/imx-weim.c @@ -204,8 +204,8 @@ static int weim_parse_dt(struct platform_device *pdev) const struct of_device_id *of_id = of_match_device(weim_id_table, &pdev->dev); const struct imx_weim_devtype *devtype = of_id->data; + int ret = 0, have_child = 0; struct device_node *child; - int ret, have_child = 0; struct weim_priv *priv; void __iomem *base; u32 reg;

1 year, 8 months

1
0
0 0

FAILED: patch "[PATCH] drm/meson: fix missing component unbind on bind errors" failed to apply to 4.14-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.14-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-4.14.y git checkout FETCH_HEAD git cherry-pick -x ba98413bf45edbf33672e2539e321b851b2cfbd1 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '1680007002228182(a)kroah.com' --subject-prefix 'PATCH 4.14.y' HEAD^.. Possible dependencies: ba98413bf45e ("drm/meson: fix missing component unbind on bind errors") fa747d75f65d ("drm/meson: Fix error handling when afbcd.ops->init fails") e67f6037ae1b ("drm/meson: split out encoder from meson_dw_hdmi") d4cb82aa2e4b ("drm/meson: Make use of the helper function devm_platform_ioremap_resourcexxx()") 65a969655cb9 ("drm/meson: Convert to Linux IRQ interfaces") 2b6cb81b95d1 ("drm/meson: dw-hdmi: Enable the iahb clock early enough") 1dfeea904550 ("drm/meson: dw-hdmi: Disable clocks on driver teardown") b33340e33acd ("drm/meson: dw-hdmi: Ensure that clocks are enabled before touching the TOP registers") 0405f94a1ae0 ("drm/meson: dw-hdmi: Register a callback to disable the regulator") e78ad18ba365 ("drm/meson: Unbind all connectors on module removal") fa62ee25280f ("drm/meson: Free RDMA resources after tearing down DRM") 35a395f1134b ("drm: bridge: dw-hdmi: Constify mode argument to dw_hdmi_phy_ops .init()") af05bba0fbe2 ("drm: bridge: dw-hdmi: Pass drm_display_info to .mode_valid()") 9bc78d6dc818 ("drm: meson: dw-hdmi: Use dw_hdmi context to replace hack") 96591a4b93fb ("drm: bridge: dw-hdmi: Pass private data pointer to .mode_valid()") b54d830ccb65 ("drm/meson: Set GEM CMA functions with DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE") 48ab4b8f236c ("drm/meson: Use GEM CMA object functions") 8976eeee8de0 ("drm/meson: add mode selection limits against specific SoC revisions") bd9ff7b521a6 ("drm/meson: Drop explicit drm_mode_config_cleanup call") 8496a2172d7c ("drm/meson: Add YUV420 output support") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From ba98413bf45edbf33672e2539e321b851b2cfbd1 Mon Sep 17 00:00:00 2001 From: Johan Hovold <johan+linaro(a)kernel.org> Date: Mon, 6 Mar 2023 11:35:33 +0100 Subject: [PATCH] drm/meson: fix missing component unbind on bind errors Make sure to unbind all subcomponents when binding the aggregate device fails. Fixes: a41e82e6c457 ("drm/meson: Add support for components") Cc: stable(a)vger.kernel.org # 4.12 Cc: Neil Armstrong <neil.armstrong(a)linaro.org> Signed-off-by: Johan Hovold <johan+linaro(a)kernel.org> Acked-by: Neil Armstrong <neil.armstrong(a)linaro.org> Signed-off-by: Neil Armstrong <neil.armstrong(a)linaro.org> Link: https://patchwork.freedesktop.org/patch/msgid/20230306103533.4915-1-johan+l… diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c index 79bfe3938d3c..7caf937c3c90 100644 --- a/drivers/gpu/drm/meson/meson_drv.c +++ b/drivers/gpu/drm/meson/meson_drv.c @@ -325,23 +325,23 @@ static int meson_drv_bind_master(struct device *dev, bool has_components) ret = meson_encoder_hdmi_init(priv); if (ret) - goto exit_afbcd; + goto unbind_all; ret = meson_plane_create(priv); if (ret) - goto exit_afbcd; + goto unbind_all; ret = meson_overlay_create(priv); if (ret) - goto exit_afbcd; + goto unbind_all; ret = meson_crtc_create(priv); if (ret) - goto exit_afbcd; + goto unbind_all; ret = request_irq(priv->vsync_irq, meson_irq, 0, drm->driver->name, drm); if (ret) - goto exit_afbcd; + goto unbind_all; drm_mode_config_reset(drm); @@ -359,6 +359,9 @@ static int meson_drv_bind_master(struct device *dev, bool has_components) uninstall_irq: free_irq(priv->vsync_irq, drm); +unbind_all: + if (has_components) + component_unbind_all(drm->dev, drm); exit_afbcd: if (priv->afbcd.ops) priv->afbcd.ops->exit(priv);

1 year, 8 months

1
0
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror March 2023