]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
auxdisplay: lcd2s: Use proper API to free the instance of charlcd object
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Wed, 23 Feb 2022 15:47:18 +0000 (17:47 +0200)
committerPaolo Pisati <paolo.pisati@canonical.com>
Wed, 9 Mar 2022 14:17:54 +0000 (15:17 +0100)
BugLink: https://bugs.launchpad.net/bugs/1964361
commit 9ed331f8a0fb674f4f06edf05a1687bf755af27b upstream.

While it might work, the current approach is fragile in a few ways:
- whenever members in the structure are shuffled, the pointer will be wrong
- the resource freeing may include more than covered by kfree()

Fix this by using charlcd_free() call instead of kfree().

Fixes: 8c9108d014c5 ("auxdisplay: add a driver for lcd2s character display")
Cc: Lars Poeschel <poeschel@lemonage.de>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
drivers/auxdisplay/lcd2s.c

index 7b9cfbbaf0079ce5b3847220bd5ba885867863fb..2578b2d454397a20ce2248a759993b0655b17f64 100644 (file)
@@ -336,7 +336,7 @@ static int lcd2s_i2c_probe(struct i2c_client *i2c,
        return 0;
 
 fail1:
-       kfree(lcd);
+       charlcd_free(lcd2s->charlcd);
        return err;
 }
 
@@ -345,7 +345,7 @@ static int lcd2s_i2c_remove(struct i2c_client *i2c)
        struct lcd2s_data *lcd2s = i2c_get_clientdata(i2c);
 
        charlcd_unregister(lcd2s->charlcd);
-       kfree(lcd2s->charlcd);
+       charlcd_free(lcd2s->charlcd);
        return 0;
 }