Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ee2eaa3 authored by Axel Lin's avatar Axel Lin Committed by Jiri Kosina
Browse files

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: default avatarAxel Lin <axel.lin@ingics.com>
Reviewed-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent b490a853

drivers/hid/hid-alps.c

+3 −2
Original line number Diff line number Diff line
@@ -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;

		}