[PATCH] staging: vt6655: Fix memory leak in vt6655_probe

[PATCH] staging: vt6655: Fix memory leak in vt6655_probe

[Navid Emamdoost]

In vt6655_probe, if vnt_init() fails the cleanup code needs to be called
like other error handling cases. The call to device_free_info() is
added.

Fixes: 67013f2c0e58 ("staging: vt6655: mac80211 conversion add main mac80211 functions")
Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com>
---
 drivers/staging/vt6655/device_main.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
index c6bb4aaf9bd0..082302944c37 100644
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -1748,8 +1748,10 @@ vt6655_probe(struct pci_dev *pcid, const struct pci_device_id *ent)
 
 	priv->hw->max_signal = 100;
 
-	if (vnt_init(priv))
+	if (vnt_init(priv)) {
+		device_free_info(priv);
 		return -ENODEV;
+	}
 
 	device_print_info(priv);
 	pci_set_drvdata(pcid, priv);
-- 
2.17.1

Re: [PATCH] staging: vt6655: Fix memory leak in vt6655_probe

[Markus Elfring]

> In vt6655_probe, if vnt_init() fails the cleanup code needs to be called
> like other error handling cases. The call to device_free_info() is
> added.

Please improve this change description.

Regards,
Markus

Re: [PATCH] staging: vt6655: Fix memory leak in vt6655_probe

[Greg Kroah-Hartman]

On Sat, Oct 05, 2019 at 06:30:13PM +0200, Markus Elfring wrote:
> > In vt6655_probe, if vnt_init() fails the cleanup code needs to be called
> > like other error handling cases. The call to device_free_info() is
> > added.
> 
> Please improve this change description.

It is fine as-is, please do not confuse people.

Re: staging: vt6655: Fix memory leak in vt6655_probe

[Markus Elfring]

>>> In vt6655_probe, if vnt_init() fails the cleanup code needs to be called
>>> like other error handling cases. The call to device_free_info() is
>>> added.
>>
>> Please improve this change description.
>
> It is fine as-is, please do not confuse people.

Would you like to clarify a known guideline once more?
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/submitting-patches.rst?id=43b815c6a8e7dbccb5b8bd9c4b099c24bc22d135#n151
“…
Describe your changes in imperative mood,
…”

Regards,
Markus