From: <gregkh@linuxfoundation.org>
To: make24@iscas.ac.cn,tomi.valkeinen@ideasonboard.com
Cc: <stable@vger.kernel.org>
Subject: FAILED: patch "[PATCH] drm: omapdrm: Add missing check for alloc_ordered_workqueue" failed to apply to 4.19-stable tree
Date: Mon, 07 Oct 2024 17:04:53 +0200 [thread overview]
Message-ID: <2024100753-rockfish-ensnare-ca86@gregkh> (raw)
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@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 e794b7b9b92977365c693760a259f8eef940c536
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2024100753-rockfish-ensnare-ca86@gregkh' --subject-prefix 'PATCH 4.19.y' HEAD^..
Possible dependencies:
e794b7b9b929 ("drm: omapdrm: Add missing check for alloc_ordered_workqueue")
2ee767922e1b ("drm/omap: Group CRTC, encoder, connector and dssdev in a structure")
ac3b13189333 ("drm/omap: Create all planes before CRTCs")
f96993630445 ("drm/omap: Remove unneeded variable assignments in omap_modeset_init")
845417b3b3b0 ("drm/omap: dss: Move DSS mgr ops and private data to dss_device")
f324b2798c87 ("drm/omap: dss: Store dss_device pointer in omap_dss_device")
c1dfe721e096 ("drm/omap: dss: Move and rename omap_dss_(get|put)_device()")
67822ae11971 ("drm/omap: dss: Remove panel devices list")
4e0bb06c0b9a ("drm/omap: dss: Split omapdss_register_display()")
b9f4d2ebf641 ("drm/omap: dss: Make omap_dss_get_next_device() more generic")
92ce521a4841 ("drm/omap: dss: Rename for_each_dss_dev macro to for_each_dss_display")
7269fde4e8c9 ("drm/omap: displays: Remove input omap_dss_device from panel data")
fb5571717c24 ("drm/omap: dss: Move src and dst check and set to connection handlers")
1f507968c30b ("drm/omap: dss: Move debug message and checks to connection handlers")
ec727e3f6184 ("drm/omap: dss: Add functions to connect and disconnect devices")
b93109d7dc9e ("drm/omap: dss: Move common device operations to common structure")
e10bd354ad79 ("drm/omap: dss: Allow looking up any device by port")
a7e82a67c1d7 ("drm/omap: dss: Rework output lookup by port node")
9184f8d94c38 ("drm/omap: dss: Create and use omapdss_device_is_registered()")
6a7c5a2200ad ("drm/omap: dss: Create global list of all omap_dss_device instances")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From e794b7b9b92977365c693760a259f8eef940c536 Mon Sep 17 00:00:00 2001
From: Ma Ke <make24@iscas.ac.cn>
Date: Thu, 8 Aug 2024 14:13:36 +0800
Subject: [PATCH] drm: omapdrm: Add missing check for alloc_ordered_workqueue
As it may return NULL pointer and cause NULL pointer dereference. Add check
for the return value of alloc_ordered_workqueue.
Cc: stable@vger.kernel.org
Fixes: 2f95bc6d324a ("drm: omapdrm: Perform initialization/cleanup at probe/remove time")
Signed-off-by: Ma Ke <make24@iscas.ac.cn>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240808061336.2796729-1-make24@iscas.ac.cn
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
index 6598c9c08ba1..d3eac4817d76 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -695,6 +695,10 @@ static int omapdrm_init(struct omap_drm_private *priv, struct device *dev)
soc = soc_device_match(omapdrm_soc_devices);
priv->omaprev = soc ? (uintptr_t)soc->data : 0;
priv->wq = alloc_ordered_workqueue("omapdrm", 0);
+ if (!priv->wq) {
+ ret = -ENOMEM;
+ goto err_alloc_workqueue;
+ }
mutex_init(&priv->list_lock);
INIT_LIST_HEAD(&priv->obj_list);
@@ -753,6 +757,7 @@ err_gem_deinit:
drm_mode_config_cleanup(ddev);
omap_gem_deinit(ddev);
destroy_workqueue(priv->wq);
+err_alloc_workqueue:
omap_disconnect_pipelines(ddev);
drm_dev_put(ddev);
return ret;
reply other threads:[~2024-10-07 15:04 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2024100753-rockfish-ensnare-ca86@gregkh \
--to=gregkh@linuxfoundation.org \
--cc=make24@iscas.ac.cn \
--cc=stable@vger.kernel.org \
--cc=tomi.valkeinen@ideasonboard.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox