HID: alps: Fix memory leak

A kfree(readbuf) call was missed if hid_hw_raw_request() fails, fix it.
Also avoid mixing direct return with goto in the error paths.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

diff --git a/drivers/hid/hid-alps.c b/drivers/hid/hid-alps.c
index 048befde295a2f79e8c847b87f7aebd0b93d7c0c..2808da9ed9c8e353e1cdb9f5b3a8a469de55e012 100644 (file)
--- a/drivers/hid/hid-alps.c
+++ b/drivers/hid/hid-alps.c
@@ -139,8 +139,8 @@ static int u1_read_write_register(struct hid_device *hdev, u32 address,
        if (read_flag) {
                readbuf = kzalloc(U1_FEATURE_REPORT_LEN, GFP_KERNEL);
                if (!readbuf) {
-                       kfree(input);
-                       return -ENOMEM;
+                       ret = -ENOMEM;
+                       goto exit;
                }
 
                ret = hid_hw_raw_request(hdev, U1_FEATURE_REPORT_ID, readbuf,
@@ -149,6 +149,7 @@ static int u1_read_write_register(struct hid_device *hdev, u32 address,
 
                if (ret < 0) {
                        dev_err(&hdev->dev, "failed read register (%d)\n", ret);
+                       kfree(readbuf);
                        goto exit;
                }