Skip to contentSkip to conversation

rpmsg: char: Add lock to avoid race when rpmsg device is released

PATCH New [email protected] 1 participant 1 message Jun 17 Stable branch

lore
Share & tools
lore

[email protected]

author
#0 lore raw

PATCH 1/1 rpmsg: char: Add lock to avoid race when rpmsg device is released

From: Deepak Kumar Singh <[email protected]>

commit 17b88a2050e9d1f89a53562f2adb709a8959e763 upstream.

When remote host goes down glink char device channel is freed and associated rpdev is destroyed through rpmsg_chrdev_eptdev_destroy(), At the same time user space apps can still try to open/poll rpmsg char device which will result in calling rpmsg_create_ept()/rpmsg_poll(). These functions will try to reference rpdev which has already been freed through rpmsg_chrdev_eptdev_destroy().

File operation functions and device removal function must be protected with lock. This patch adds existing ept lock in remove function as well.

Signed-off-by Deepak Kumar Singh <[email protected]>
Signed-off-by Bjorn Andersson <[email protected]>
Link https://lore.kernel.org/r/[email protected] open here
Signed-off-by Wen Yang <[email protected]>
---
 drivers/rpmsg/rpmsg_char.c | 8 ++++++++
 1 file changed, 8 insertions(+)
drivers/rpmsg/rpmsg_char.c +8 -0
index 3e0b8f3496ed..a271fceb16f4 100644
@@ -75,6 +75,7 @@ int rpmsg_chrdev_eptdev_destroy(struct device *dev, void *data)
 	struct rpmsg_eptdev *eptdev = dev_to_eptdev(dev);
 
 	mutex_lock(&eptdev->ept_lock);
+	eptdev->rpdev = NULL;
 	if (eptdev->ept) {
 		/* The default endpoint is released by the rpmsg core */
 		if (!eptdev->default_ept)

@@ -128,6 +129,11 @@ static int rpmsg_eptdev_open(struct inode *inode, struct file *filp)
 		return -EBUSY;
 	}
 
+	if (!eptdev->rpdev) {
+		mutex_unlock(&eptdev->ept_lock);
+		return -ENETRESET;
+	}
+
 	get_device(dev);
 
 	/*

@@ -279,7 +285,9 @@ static __poll_t rpmsg_eptdev_poll(struct file *filp, poll_table *wait)
 	if (!skb_queue_empty(&eptdev->queue))
 		mask |= EPOLLIN | EPOLLRDNORM;
 
+	mutex_lock(&eptdev->ept_lock);
 	mask |= rpmsg_poll(eptdev->ept, filp, wait);
+	mutex_unlock(&eptdev->ept_lock);
 
 	return mask;
 }
Signature · 1 line
2.34.1