Skip to contentSkip to conversation

auxdisplay: fix use after free in lcd2s_i2c_remove()

PATCH In review Dan Carpenter 3 participants 3 messages Nov 6, 2020 – Nov 9, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 auxdisplay: fix use after free in lcd2s_i2c_remove()

The kfree() needs to be moved down a line to prevent a use after free.

Fixes 8c9108d014c5 ("auxdisplay: add a driver for lcd2s character display")
---
 drivers/auxdisplay/lcd2s.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/auxdisplay/lcd2s.c +1 -1
index cfa5f86deeef..3eb7f04db6cb 100644
@@ -348,8 +348,8 @@ static int lcd2s_i2c_remove(struct i2c_client *i2c)
 {
 	struct lcd2s_data *lcd2s = i2c_get_clientdata(i2c);
 
-	kfree(lcd2s->charlcd);
 	charlcd_unregister(lcd2s->charlcd);
+	kfree(lcd2s->charlcd);
 	return 0;
 }
 
Signature · 1 line
2.28.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 13 lines · Dan Carpenter

The kfree() needs to be moved down a line to prevent a use after free.

Fixes 8c9108d014c5 ("auxdisplay: add a driver for lcd2s character display")
---
 drivers/auxdisplay/lcd2s.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/auxdisplay/lcd2s.c +0 -0
index cfa5f86deeef..3eb7f04db6cb 100644

drivers/auxdisplay/lcd2s.c static int lcd2s_i2c_remove(struct i2c_client *i2c) · line 354

Quoted 8 lines
drivers/auxdisplay/lcd2s.c +1 -1
@@ -348,8 +348,8 @@ static int lcd2s_i2c_remove(struct i2c_client *i2c)
 {
 	struct lcd2s_data *lcd2s = i2c_get_clientdata(i2c);
 
-	kfree(lcd2s->charlcd);
 	charlcd_unregister(lcd2s->charlcd);
+	kfree(lcd2s->charlcd);
 	return 0;
 }

Thanks,
Lars

#2 lore raw
In reply to Dan Carpenter
Quoted 2 lines · Dan Carpenter

The kfree() needs to be moved down a line to prevent a use after free.

Thanks Dan for catching this one up while in -next. I'll pick it up.

Cheers,
Miguel