FAILED: patch "[PATCH] rpmsg: char: Fix use-after-free on probe error path" failed to apply to 6.1-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 6.1-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 <[email protected]>.
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-6.1.y
git checkout FETCH_HEAD
git cherry-pick -x 1ff3f528e67d20e2b1483dcaba899dc7832b2e6b
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026070228-dwelled-nurture-5733@gregkh' --subject-prefix 'PATCH 6.1.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 1ff3f528e67d20e2b1483dcaba899dc7832b2e6b Mon Sep 17 00:00:00 2001
From: Yuho Choi <[email protected]>
Date: Mon, 1 Jun 2026 14:32:47 -0400
Subject: [PATCH] rpmsg: char: Fix use-after-free on probe error path
rpmsg_chrdev_probe() stores the newly allocated eptdev in the default endpoint's priv pointer before calling rpmsg_chrdev_eptdev_add(). If rpmsg_chrdev_eptdev_add() then fails, its error path frees eptdev while the default endpoint may still dispatch callbacks with the stale priv pointer.
Avoid publishing eptdev through the default endpoint until rpmsg_chrdev_eptdev_add() succeeds. Messages received before the priv pointer is published should be ignored by rpmsg_ept_cb(). Flow-control updates can hit rpmsg_ept_flow_cb() in the same window, so make both callbacks return success when priv is NULL.
drivers/rpmsg/rpmsg_char.c +13 -2
@@ -104,6 +104,9 @@ static int rpmsg_ept_cb(struct rpmsg_device *rpdev, void *buf, int len,struct rpmsg_eptdev *eptdev = priv;struct sk_buff *skb; +if (!eptdev) +return 0 ; + skb =alloc_skb (len,GFP_ATOMIC );if (!skb)return -ENOMEM ;
@@ -124,6 +127,9 @@ static int rpmsg_ept_flow_cb(struct rpmsg_device *rpdev, void *priv, bool enable {struct rpmsg_eptdev *eptdev = priv; +if (!eptdev) +return 0 ; + eptdev->remote_flow_restricted = enable; eptdev->remote_flow_updated = true;
@@ -490,6 +496,7 @@ static int rpmsg_chrdev_probe(struct rpmsg_device *rpdev)struct rpmsg_channel_info chinfo;struct rpmsg_eptdev *eptdev;struct device *dev = &rpdev->dev; +int ret;memcpy (chinfo.name, rpdev->id.name,RPMSG_NAME_SIZE ); chinfo.src = rpdev->src;
@@ -502,13 +509,17 @@ static int rpmsg_chrdev_probe(struct rpmsg_device *rpdev)/* Set the default_ept to the rpmsg device endpoint */ eptdev->default_ept = rpdev->ept; + ret =rpmsg_chrdev_eptdev_add (eptdev, chinfo); + +if (ret) +return ret;/* * The rpmsg_ept_cb uses *priv parameter to get its rpmsg_eptdev context. -* Storedit in default_ept *priv field. +* Stored it in default_ept *priv field. */ eptdev->default_ept->priv = eptdev; -return rpmsg_chrdev_eptdev_add (eptdev, chinfo); +return 0 ; }static void rpmsg_chrdev_remove (struct rpmsg_device *rpdev)
Sasha Levin
maintainerPATCH 1/1 rpmsg: char: Fix use-after-free on probe error path
From: Yuho Choi <[email protected]>
[ Upstream commit 1ff3f528e67d20e2b1483dcaba899dc7832b2e6b ]
rpmsg_chrdev_probe() stores the newly allocated eptdev in the default endpoint's priv pointer before calling rpmsg_chrdev_eptdev_add(). If rpmsg_chrdev_eptdev_add() then fails, its error path frees eptdev while the default endpoint may still dispatch callbacks with the stale priv pointer.
Avoid publishing eptdev through the default endpoint until rpmsg_chrdev_eptdev_add() succeeds. Messages received before the priv pointer is published should be ignored by rpmsg_ept_cb(). Flow-control updates can hit rpmsg_ept_flow_cb() in the same window, so make both callbacks return success when priv is NULL.
--- drivers/rpmsg/rpmsg_char.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/rpmsg/rpmsg_char.c +10 -2
@@ -100,6 +100,9 @@ static int rpmsg_ept_cb(struct rpmsg_device *rpdev, void *buf, int len,struct rpmsg_eptdev *eptdev = priv;struct sk_buff *skb; +if (!eptdev) +return 0 ; + skb =alloc_skb (len,GFP_ATOMIC );if (!skb)return -ENOMEM ;
@@ -448,6 +451,7 @@ static int rpmsg_chrdev_probe(struct rpmsg_device *rpdev)struct rpmsg_channel_info chinfo;struct rpmsg_eptdev *eptdev;struct device *dev = &rpdev->dev; +int ret;memcpy (chinfo.name, rpdev->id.name,RPMSG_NAME_SIZE ); chinfo.src = rpdev->src;
@@ -460,13 +464,17 @@ static int rpmsg_chrdev_probe(struct rpmsg_device *rpdev)/* Set the default_ept to the rpmsg device endpoint */ eptdev->default_ept = rpdev->ept; + ret =rpmsg_chrdev_eptdev_add (eptdev, chinfo); + +if (ret) +return ret;/* * The rpmsg_ept_cb uses *priv parameter to get its rpmsg_eptdev context. -* Storedit in default_ept *priv field. +* Stored it in default_ept *priv field. */ eptdev->default_ept->priv = eptdev; -return rpmsg_chrdev_eptdev_add (eptdev, chinfo); +return 0 ; }static void rpmsg_chrdev_remove (struct rpmsg_device *rpdev)
Signature · 1 line
2.53.0