diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2021-07-17 16:36:07 +0200 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2021-07-17 16:39:56 +0200 |
| commit | f7e506ec4a9966be8b2a87d3324302f0f5dd5a29 (patch) | |
| tree | 740e74933763e2d25d96c346631916ad0e77c30e /drivers/platform/x86/think-lmi.c | |
| parent | 30e78435d3bf803cabdc2a1c2eb36e6983aa4596 (diff) | |
| download | linux-stable-f7e506ec4a9966be8b2a87d3324302f0f5dd5a29.tar.gz linux-stable-f7e506ec4a9966be8b2a87d3324302f0f5dd5a29.tar.bz2 linux-stable-f7e506ec4a9966be8b2a87d3324302f0f5dd5a29.zip | |
platform/x86: think-lmi: Fix possible mem-leaks on tlmi_analyze() error-exit
Fix 2 possible memleaks on error-exits from tlmi_analyze():
1. If the kzalloc of pwd_power fails, then not only free the atributes,
but also the allocated pwd_admin struct.
2. Freeing the attributes should also free the possible_values strings.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20210717143607.3580-3-hdegoede@redhat.com
Diffstat (limited to 'drivers/platform/x86/think-lmi.c')
| -rw-r--r-- | drivers/platform/x86/think-lmi.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/platform/x86/think-lmi.c b/drivers/platform/x86/think-lmi.c index c22edcf26aaa..6cfed4427fb0 100644 --- a/drivers/platform/x86/think-lmi.c +++ b/drivers/platform/x86/think-lmi.c @@ -866,7 +866,7 @@ static int tlmi_analyze(void) tlmi_priv.pwd_power = kzalloc(sizeof(struct tlmi_pwd_setting), GFP_KERNEL); if (!tlmi_priv.pwd_power) { ret = -ENOMEM; - goto fail_clear_attr; + goto fail_free_pwd_admin; } strscpy(tlmi_priv.pwd_power->kbdlang, "us", TLMI_LANG_MAXLEN); tlmi_priv.pwd_power->encoding = TLMI_ENCODING_ASCII; @@ -882,9 +882,15 @@ static int tlmi_analyze(void) return 0; +fail_free_pwd_admin: + kfree(tlmi_priv.pwd_admin); fail_clear_attr: - for (i = 0; i < TLMI_SETTINGS_COUNT; ++i) - kfree(tlmi_priv.setting[i]); + for (i = 0; i < TLMI_SETTINGS_COUNT; ++i) { + if (tlmi_priv.setting[i]) { + kfree(tlmi_priv.setting[i]->possible_values); + kfree(tlmi_priv.setting[i]); + } + } return ret; } |