hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ACPI: fix potential memory leaks in driver/acpi/video.c 

acpi_video_bus_get_one_device() and other functions in driver/acpi/video.c do
not release allocated memory on remove and on the error path.

Signed-off-by: "Yu, Luming" <luming.yu@intel.com>
Signed-off-by: Vasily Averin <vvs@sw.ru>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Yu, Luming 2006-04-27 05:25:00 -04:00 committed by Len Brown
parent d8c3291c73
commit 973bf491a5
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/acpi/video.c
View File

@ -1294,7 +1294,7 @@ acpi_video_bus_get_one_device(struct acpi_device *device,
struct acpi_video_bus *video) struct acpi_video_bus *video)
{ {
unsigned long device_id; unsigned long device_id;
int status, result; int status;
struct acpi_video_device *data; struct acpi_video_device *data;
ACPI_FUNCTION_TRACE("acpi_video_bus_get_one_device"); ACPI_FUNCTION_TRACE("acpi_video_bus_get_one_device");
@ -1346,8 +1346,11 @@ acpi_video_bus_get_one_device(struct acpi_device *device,
if (ACPI_FAILURE(status)) { if (ACPI_FAILURE(status)) {
ACPI_DEBUG_PRINT((ACPI_DB_ERROR, ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
"Error installing notify handler\n")); "Error installing notify handler\n"));
result = -ENODEV; if(data->brightness)
goto end; kfree(data->brightness->levels);
kfree(data->brightness);
kfree(data);
return -ENODEV;
} }
down(&video->sem); down(&video->sem);
@ -1359,7 +1362,6 @@ acpi_video_bus_get_one_device(struct acpi_device *device,
return_VALUE(0); return_VALUE(0);
} }
end:
return_VALUE(-ENOENT); return_VALUE(-ENOENT);
} }
@ -1643,8 +1645,9 @@ static int acpi_video_bus_put_devices(struct acpi_video_bus *video)
printk(KERN_WARNING PREFIX printk(KERN_WARNING PREFIX
"hhuuhhuu bug in acpi video driver.\n"); "hhuuhhuu bug in acpi video driver.\n");
if (data->brightness);
kfree(data->brightness->levels);
kfree(data->brightness); kfree(data->brightness);
kfree(data); kfree(data);
} }
@ -1785,6 +1788,10 @@ static int acpi_video_bus_add(struct acpi_device *device)
if (ACPI_FAILURE(status)) { if (ACPI_FAILURE(status)) {
ACPI_DEBUG_PRINT((ACPI_DB_ERROR, ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
"Error installing notify handler\n")); "Error installing notify handler\n"));
acpi_video_bus_stop_devices(video);
acpi_video_bus_put_devices(video);
kfree(video->attached_array);
acpi_video_bus_remove_fs(device);
result = -ENODEV; result = -ENODEV;
goto end; goto end;
} }
@ -1796,10 +1803,8 @@ static int acpi_video_bus_add(struct acpi_device *device)
video->flags.post ? "yes" : "no"); video->flags.post ? "yes" : "no");
end: end:
if (result) { if (result)
acpi_video_bus_remove_fs(device);
kfree(video); kfree(video);
}
return_VALUE(result); return_VALUE(result);
} }