From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: linux-kernel@vger.kernel.org
Cc: Miguel Ojeda <ojeda@kernel.org>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Lars Poeschel <poeschel@lemonage.de>
Subject: [PATCH v1 3/3] auxdisplay: lcd2s: Use proper API to free the instance of charlcd object
Date: Wed, 23 Feb 2022 17:47:18 +0200 [thread overview]
Message-ID: <20220223154718.83500-3-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20220223154718.83500-1-andriy.shevchenko@linux.intel.com>
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>
---
drivers/auxdisplay/lcd2s.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/auxdisplay/lcd2s.c b/drivers/auxdisplay/lcd2s.c
index 7b9cfbbaf007..2578b2d45439 100644
--- a/drivers/auxdisplay/lcd2s.c
+++ b/drivers/auxdisplay/lcd2s.c
@@ -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;
}
--
2.34.1
next prev parent reply other threads:[~2022-02-23 15:47 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-23 15:47 [PATCH v1 1/3] auxdisplay: lcd2s: Fix lcd2s_redefine_char() feature Andy Shevchenko
2022-02-23 15:47 ` [PATCH v1 2/3] auxdisplay: lcd2s: Fix memory leak in ->remove() Andy Shevchenko
2022-03-03 1:19 ` Miguel Ojeda
2022-02-23 15:47 ` Andy Shevchenko [this message]
2022-03-03 1:19 ` [PATCH v1 3/3] auxdisplay: lcd2s: Use proper API to free the instance of charlcd object Miguel Ojeda
2022-03-02 15:47 ` [PATCH v1 1/3] auxdisplay: lcd2s: Fix lcd2s_redefine_char() feature Andy Shevchenko
2022-03-02 16:12 ` Geert Uytterhoeven
2022-03-03 1:18 ` Miguel Ojeda
2022-03-03 10:46 ` Miguel Ojeda
2022-03-03 11:02 ` Andy Shevchenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220223154718.83500-3-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=ojeda@kernel.org \
--cc=poeschel@lemonage.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®