ACPI: video: correct acpi_video_bus_add error processing
acpi_video_bus_get_devices() may fail due to some video output device doesn't have the _ADR method, and in this case, the error processing is to simply free the video structure in acpi_video_bus_add(), while leaving those already registered video output devices in the wild, which means for some video output device, we have already registered a backlight interface and installed a notification handler for it. So it can happen when user is using this system, on hotkey pressing, the notification handler will send a keycode through a non-existing input device, causing kernel freeze. To solve this problem, free all those already registered video output devices once something goes wrong in acpi_video_bus_get_devices(), so that no wild backlight interfaces and notification handlers exist. References: https://bugzilla.kernel.org/show_bug.cgi?id=51731 Reported-and-tested-by: <i-tek@web.de> Signed-off-by: Aaron Lu <aaron.lu@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Aaron Lu
Rafael J. Wysocki
parent
a6432ded29
commit
91e13aa370
1 changed files with 65 additions and 76 deletions
|
|
@ -167,7 +167,8 @@ struct acpi_video_device_flags {
|
||||||
u8 dvi:1;
|
u8 dvi:1;
|
||||||
u8 bios:1;
|
u8 bios:1;
|
||||||
u8 unknown:1;
|
u8 unknown:1;
|
||||||
u8 reserved:2;
|
u8 notify:1;
|
||||||
|
u8 reserved:1;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct acpi_video_device_cap {
|
struct acpi_video_device_cap {
|
||||||
|
|
@ -1074,53 +1075,51 @@ acpi_video_bus_get_one_device(struct acpi_device *device,
|
||||||
struct acpi_video_device *data;
|
struct acpi_video_device *data;
|
||||||
struct acpi_video_device_attrib* attribute;
|
struct acpi_video_device_attrib* attribute;
|
||||||
|
|
||||||
if (!device || !video)
|
|
||||||
return -EINVAL;
|
|
||||||
|
|
||||||
status =
|
status =
|
||||||
acpi_evaluate_integer(device->handle, "_ADR", NULL, &device_id);
|
acpi_evaluate_integer(device->handle, "_ADR", NULL, &device_id);
|
||||||
if (ACPI_SUCCESS(status)) {
|
/* Some device omits _ADR, we skip them instead of fail */
|
||||||
|
if (ACPI_FAILURE(status))
|
||||||
|
return 0;
|
||||||
|
|
||||||
data = kzalloc(sizeof(struct acpi_video_device), GFP_KERNEL);
|
data = kzalloc(sizeof(struct acpi_video_device), GFP_KERNEL);
|
||||||
if (!data)
|
if (!data)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
strcpy(acpi_device_name(device), ACPI_VIDEO_DEVICE_NAME);
|
strcpy(acpi_device_name(device), ACPI_VIDEO_DEVICE_NAME);
|
||||||
strcpy(acpi_device_class(device), ACPI_VIDEO_CLASS);
|
strcpy(acpi_device_class(device), ACPI_VIDEO_CLASS);
|
||||||
device->driver_data = data;
|
device->driver_data = data;
|
||||||
|
|
||||||
data->device_id = device_id;
|
data->device_id = device_id;
|
||||||
data->video = video;
|
data->video = video;
|
||||||
data->dev = device;
|
data->dev = device;
|
||||||
|
|
||||||
attribute = acpi_video_get_device_attr(video, device_id);
|
attribute = acpi_video_get_device_attr(video, device_id);
|
||||||
|
|
||||||
if((attribute != NULL) && attribute->device_id_scheme) {
|
if((attribute != NULL) && attribute->device_id_scheme) {
|
||||||
switch (attribute->display_type) {
|
switch (attribute->display_type) {
|
||||||
case ACPI_VIDEO_DISPLAY_CRT:
|
case ACPI_VIDEO_DISPLAY_CRT:
|
||||||
data->flags.crt = 1;
|
data->flags.crt = 1;
|
||||||
break;
|
break;
|
||||||
case ACPI_VIDEO_DISPLAY_TV:
|
case ACPI_VIDEO_DISPLAY_TV:
|
||||||
data->flags.tvout = 1;
|
data->flags.tvout = 1;
|
||||||
break;
|
break;
|
||||||
case ACPI_VIDEO_DISPLAY_DVI:
|
case ACPI_VIDEO_DISPLAY_DVI:
|
||||||
data->flags.dvi = 1;
|
data->flags.dvi = 1;
|
||||||
break;
|
break;
|
||||||
case ACPI_VIDEO_DISPLAY_LCD:
|
case ACPI_VIDEO_DISPLAY_LCD:
|
||||||
data->flags.lcd = 1;
|
data->flags.lcd = 1;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
data->flags.unknown = 1;
|
data->flags.unknown = 1;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if(attribute->bios_can_detect)
|
if(attribute->bios_can_detect)
|
||||||
data->flags.bios = 1;
|
data->flags.bios = 1;
|
||||||
} else {
|
} else {
|
||||||
/* Check for legacy IDs */
|
/* Check for legacy IDs */
|
||||||
device_type = acpi_video_get_device_type(video,
|
device_type = acpi_video_get_device_type(video, device_id);
|
||||||
device_id);
|
/* Ignore bits 16 and 18-20 */
|
||||||
/* Ignore bits 16 and 18-20 */
|
switch (device_type & 0xffe2ffff) {
|
||||||
switch (device_type & 0xffe2ffff) {
|
|
||||||
case ACPI_VIDEO_DISPLAY_LEGACY_MONITOR:
|
case ACPI_VIDEO_DISPLAY_LEGACY_MONITOR:
|
||||||
data->flags.crt = 1;
|
data->flags.crt = 1;
|
||||||
break;
|
break;
|
||||||
|
|
@ -1132,34 +1131,24 @@ acpi_video_bus_get_one_device(struct acpi_device *device,
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
data->flags.unknown = 1;
|
data->flags.unknown = 1;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
acpi_video_device_bind(video, data);
|
|
||||||
acpi_video_device_find_cap(data);
|
|
||||||
|
|
||||||
status = acpi_install_notify_handler(device->handle,
|
|
||||||
ACPI_DEVICE_NOTIFY,
|
|
||||||
acpi_video_device_notify,
|
|
||||||
data);
|
|
||||||
if (ACPI_FAILURE(status)) {
|
|
||||||
printk(KERN_ERR PREFIX
|
|
||||||
"Error installing notify handler\n");
|
|
||||||
if(data->brightness)
|
|
||||||
kfree(data->brightness->levels);
|
|
||||||
kfree(data->brightness);
|
|
||||||
kfree(data);
|
|
||||||
return -ENODEV;
|
|
||||||
}
|
|
||||||
|
|
||||||
mutex_lock(&video->device_list_lock);
|
|
||||||
list_add_tail(&data->entry, &video->video_device_list);
|
|
||||||
mutex_unlock(&video->device_list_lock);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return -ENOENT;
|
acpi_video_device_bind(video, data);
|
||||||
|
acpi_video_device_find_cap(data);
|
||||||
|
|
||||||
|
status = acpi_install_notify_handler(device->handle, ACPI_DEVICE_NOTIFY,
|
||||||
|
acpi_video_device_notify, data);
|
||||||
|
if (ACPI_FAILURE(status))
|
||||||
|
dev_err(&device->dev, "Error installing notify handler\n");
|
||||||
|
else
|
||||||
|
data->flags.notify = 1;
|
||||||
|
|
||||||
|
mutex_lock(&video->device_list_lock);
|
||||||
|
list_add_tail(&data->entry, &video->video_device_list);
|
||||||
|
mutex_unlock(&video->device_list_lock);
|
||||||
|
|
||||||
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
@ -1452,9 +1441,8 @@ acpi_video_bus_get_devices(struct acpi_video_bus *video,
|
||||||
|
|
||||||
status = acpi_video_bus_get_one_device(dev, video);
|
status = acpi_video_bus_get_one_device(dev, video);
|
||||||
if (status) {
|
if (status) {
|
||||||
printk(KERN_WARNING PREFIX
|
dev_err(&dev->dev, "Can't attach device\n");
|
||||||
"Can't attach device\n");
|
break;
|
||||||
continue;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return status;
|
return status;
|
||||||
|
|
@ -1467,13 +1455,14 @@ static int acpi_video_bus_put_one_device(struct acpi_video_device *device)
|
||||||
if (!device || !device->video)
|
if (!device || !device->video)
|
||||||
return -ENOENT;
|
return -ENOENT;
|
||||||
|
|
||||||
status = acpi_remove_notify_handler(device->dev->handle,
|
if (device->flags.notify) {
|
||||||
ACPI_DEVICE_NOTIFY,
|
status = acpi_remove_notify_handler(device->dev->handle,
|
||||||
acpi_video_device_notify);
|
ACPI_DEVICE_NOTIFY, acpi_video_device_notify);
|
||||||
if (ACPI_FAILURE(status)) {
|
if (ACPI_FAILURE(status))
|
||||||
printk(KERN_WARNING PREFIX
|
dev_err(&device->dev->dev,
|
||||||
"Can't remove video notify handler\n");
|
"Can't remove video notify handler\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (device->backlight) {
|
if (device->backlight) {
|
||||||
backlight_device_unregister(device->backlight);
|
backlight_device_unregister(device->backlight);
|
||||||
device->backlight = NULL;
|
device->backlight = NULL;
|
||||||
|
|
@ -1755,7 +1744,7 @@ static int acpi_video_bus_add(struct acpi_device *device)
|
||||||
|
|
||||||
error = acpi_video_bus_get_devices(video, device);
|
error = acpi_video_bus_get_devices(video, device);
|
||||||
if (error)
|
if (error)
|
||||||
goto err_free_video;
|
goto err_put_video;
|
||||||
|
|
||||||
video->input = input = input_allocate_device();
|
video->input = input = input_allocate_device();
|
||||||
if (!input) {
|
if (!input) {
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue