Skip to contentSkip to conversation

fsi: occ: Prevent use after free

PATCH Superseded Eddie James 2 participants 3 messages May 12, 2022 – May 13, 2022 FSI

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Eddie James

author maintainer
#0 lore raw

PATCH 1/1 fsi: occ: Prevent use after free

Use get_device and put_device in the open and close functions to make sure the device doesn't get freed while a file descriptor is open.

---
 drivers/fsi/fsi-occ.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/fsi/fsi-occ.c +7 -1
index c9cc75fbdfb9..9e48dc62b1c5 100644
@@ -82,6 +82,9 @@ static int occ_open(struct inode *inode, struct file *file)
 	struct miscdevice *mdev = file->private_data;
 	struct occ *occ = to_occ(mdev);
 
+	if (!occ->buffer)
+		return -ENOENT;
+
 	if (!client)
 		return -ENOMEM;
 
@@ -94,6 +97,7 @@ static int occ_open(struct inode *inode, struct file *file)
 	client->occ = occ;
 	mutex_init(&client->lock);
 	file->private_data = client;
+	get_device(occ->dev);
 
 	/* We allocate a 1-page buffer, make sure it all fits */
 	BUILD_BUG_ON((OCC_CMD_DATA_BYTES + 3) > PAGE_SIZE);
@@ -143,7 +147,7 @@ static ssize_t occ_write(struct file *file, const char __user *buf,
 	ssize_t rc;
 	u8 *cmd;
 
-	if (!client)
+	if (!client || !client->occ->buffer)
 		return -ENODEV;
 
 	if (len > (OCC_CMD_DATA_BYTES + 3) || len < 3)
@@ -197,6 +201,7 @@ static int occ_release(struct inode *inode, struct file *file)
 {
 	struct occ_client *client = file->private_data;
 
+	put_device(client->occ->dev);
 	free_page((unsigned long)client->buffer);
 	kfree(client);
 
@@ -672,6 +677,7 @@ static int occ_remove(struct platform_device *pdev)
 	struct occ *occ = platform_get_drvdata(pdev);
 
 	kvfree(occ->buffer);
+	occ->buffer = NULL;
 
 	misc_deregister(&occ->mdev);
 
Signature · 1 line
2.27.0
#1 lore raw
Quoted 49 lines · Eddie James

Use get_device and put_device in the open and close functions to make sure the device doesn't get freed while a file descriptor is open.

---
  drivers/fsi/fsi-occ.c | 8 +++++++-
  1 file changed, 7 insertions(+), 1 deletion(-)
drivers/fsi/fsi-occ.c +6 -1
index c9cc75fbdfb9..9e48dc62b1c5 100644
@@ -82,6 +82,9 @@ static int occ_open(struct inode *inode, struct file *file)
  	struct miscdevice *mdev = file->private_data;
  	struct occ *occ = to_occ(mdev);
 
+	if (!occ->buffer)
+		return -ENOENT;
+
  	if (!client)
  		return -ENOMEM;
 
@@ -94,6 +97,7 @@ static int occ_open(struct inode *inode, struct file *file)
  	client->occ = occ;
  	mutex_init(&client->lock);
  	file->private_data = client;
+	get_device(occ->dev);
 
  	/* We allocate a 1-page buffer, make sure it all fits */
  	BUILD_BUG_ON((OCC_CMD_DATA_BYTES + 3) > PAGE_SIZE);
@@ -143,7 +147,7 @@ static ssize_t occ_write(struct file *file, const char __user *buf,
  	ssize_t rc;
  	u8 *cmd;
 
-	if (!client)
+	if (!client || !client->occ->buffer)
  		return -ENODEV;
 
  	if (len > (OCC_CMD_DATA_BYTES + 3) || len < 3)
@@ -197,6 +201,7 @@ static int occ_release(struct inode *inode, struct file *file)
  {
  	struct occ_client *client = file->private_data;
 
+	put_device(client->occ->dev);
  	free_page((unsigned long)client->buffer);
  	kfree(client);
 

drivers/fsi/fsi-occ.c static int occ_remove(struct platform_device *pdev) · line 680

Quoted 4 lines
drivers/fsi/fsi-occ.c +1 -0
@@ -672,6 +677,7 @@ static int occ_remove(struct platform_device *pdev)
  	struct occ *occ = platform_get_drvdata(pdev);
 
  	kvfree(occ->buffer);
+	occ->buffer = NULL;

Isn't this slightly racy (there is no guarantee that occ->buffer is updated by the time it is used by the write function, and there is no synchronization across CPUs which ensures that the pointer is actually written to memory before it is used) ?

Thanks,
Guenter

author maintainer
#2 lore raw
Quoted 46 lines · Guenter Roeck
Quoted 45 lines · Eddie James

Use get_device and put_device in the open and close functions to make sure the device doesn't get freed while a file descriptor is open.

---
  drivers/fsi/fsi-occ.c | 8 +++++++-

  1 file changed, 7 insertions(+), 1 deletion(-)
drivers/fsi/fsi-occ.c +2 -0
index c9cc75fbdfb9..9e48dc62b1c5 100644
@@ -82,6 +82,9 @@ static int occ_open(struct inode *inode, struct 
 file *file)
       struct miscdevice *mdev = file->private_data;
       struct occ *occ = to_occ(mdev);
   +    if (!occ->buffer)
+        return -ENOENT;
+
       if (!client)
           return -ENOMEM;

  @@ -94,6 +97,7 @@ static int occ_open(struct inode *inode, struct file *file) client->occ = occ;
      mutex_init(&client->lock);
      file->private_data = client;
+    get_device(occ->dev);
        /* We allocate a 1-page buffer, make sure it all fits */ BUILD_BUG_ON((OCC_CMD_DATA_BYTES + 3) > PAGE_SIZE);

drivers/fsi/fsi-occ.c +1 -0
@@ -143,7 +147,7 @@ static ssize_t occ_write(struct file *file, const 
 char __user *buf,
       ssize_t rc;
       u8 *cmd;
   -    if (!client)
+    if (!client || !client->occ->buffer)
           return -ENODEV;
         if (len > (OCC_CMD_DATA_BYTES + 3) || len < 3)
@@ -197,6 +201,7 @@ static int occ_release(struct inode *inode, 
 struct file *file)
   {
       struct occ_client *client = file->private_data;
   +    put_device(client->occ->dev);
       free_page((unsigned long)client->buffer);
       kfree(client);

  @@ -672,6 +677,7 @@ static int occ_remove(struct platform_device *pdev)

Quoted 8 lines
Quoted 3 lines

      struct occ *occ = platform_get_drvdata(pdev); kvfree(occ->buffer);
+    occ->buffer = NULL;

Isn't this slightly racy (there is no guarantee that occ->buffer is updated by the time it is used by the write function, and there is no synchronization across CPUs which ensures that the pointer is actually written to memory before it is used) ?

Yes, it is. And now that I think about it, there's nothing to prevent the driver remove (and freeing buffer) while a write is ongoing. Probably need to lock in the remove function...

Thanks

Eddie

Quoted 3 lines

Thanks,
Guenter