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

Commit cf7acfab authored by Denis V. Lunev's avatar Denis V. Lunev Committed by Linus Torvalds
Browse files

acpi: use non-racy method for proc entries creation 



Use proc_create()/proc_create_data() to make sure that ->proc_fops and ->data
be setup before gluing PDE to main tree.

Add correct ->owner to proc_fops to fix reading/module unloading race.

Signed-off-by: default avatarDenis V. Lunev <den@openvz.org>
Cc: Len Brown <lenb@kernel.org>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 66747138

drivers/acpi/ac.c

+4 −8
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ struct acpi_ac { 


#ifdef CONFIG_ACPI_PROCFS_POWER

static const struct file_operations acpi_ac_fops = {

	.owner = THIS_MODULE,

	.open = acpi_ac_open_fs,

	.read = seq_read,

	.llseek = seq_lseek,
@@ -195,16 +196,11 @@ static int acpi_ac_add_fs(struct acpi_device *device) 
	}



	/* 'state' [R] */

	entry = create_proc_entry(ACPI_AC_FILE_STATE,

				  S_IRUGO, acpi_device_dir(device));

	entry = proc_create_data(ACPI_AC_FILE_STATE,

				 S_IRUGO, acpi_device_dir(device),

				 &acpi_ac_fops, acpi_driver_data(device));

	if (!entry)

		return -ENODEV;

	else {

		entry->proc_fops = &acpi_ac_fops;

		entry->data = acpi_driver_data(device);

		entry->owner = THIS_MODULE;

	}



	return 0;

}

drivers/acpi/battery.c

+5 −7
Original line number Diff line number Diff line
@@ -741,15 +741,13 @@ static int acpi_battery_add_fs(struct acpi_device *device) 
	}



	for (i = 0; i < ACPI_BATTERY_NUMFILES; ++i) {

		entry = create_proc_entry(acpi_battery_file[i].name,

				  acpi_battery_file[i].mode, acpi_device_dir(device));

		entry = proc_create_data(acpi_battery_file[i].name,

					 acpi_battery_file[i].mode,

					 acpi_device_dir(device),

					 &acpi_battery_file[i].ops,

					 acpi_driver_data(device));

		if (!entry)

			return -ENODEV;

		else {

			entry->proc_fops = &acpi_battery_file[i].ops;

			entry->data = acpi_driver_data(device);

			entry->owner = THIS_MODULE;

		}

	}

	return 0;

}

drivers/acpi/button.c

+10 −14
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ struct acpi_button { 
};



static const struct file_operations acpi_button_info_fops = {

	.owner = THIS_MODULE,

	.open = acpi_button_info_open_fs,

	.read = seq_read,

	.llseek = seq_lseek,
@@ -109,6 +110,7 @@ static const struct file_operations acpi_button_info_fops = { 
};



static const struct file_operations acpi_button_state_fops = {

	.owner = THIS_MODULE,

	.open = acpi_button_state_open_fs,

	.read = seq_read,

	.llseek = seq_lseek,
@@ -207,27 +209,21 @@ static int acpi_button_add_fs(struct acpi_device *device) 
	acpi_device_dir(device)->owner = THIS_MODULE;



	/* 'info' [R] */

	entry = create_proc_entry(ACPI_BUTTON_FILE_INFO,

				  S_IRUGO, acpi_device_dir(device));

	entry = proc_create_data(ACPI_BUTTON_FILE_INFO,

				 S_IRUGO, acpi_device_dir(device),

				 &acpi_button_info_fops,

				 acpi_driver_data(device));

	if (!entry)

		return -ENODEV;

	else {

		entry->proc_fops = &acpi_button_info_fops;

		entry->data = acpi_driver_data(device);

		entry->owner = THIS_MODULE;

	}



	/* show lid state [R] */

	if (button->type == ACPI_BUTTON_TYPE_LID) {

		entry = create_proc_entry(ACPI_BUTTON_FILE_STATE,

					  S_IRUGO, acpi_device_dir(device));

		entry = proc_create_data(ACPI_BUTTON_FILE_STATE,

					 S_IRUGO, acpi_device_dir(device),

					 &acpi_button_state_fops,

					 acpi_driver_data(device));

		if (!entry)

			return -ENODEV;

		else {

			entry->proc_fops = &acpi_button_state_fops;

			entry->data = acpi_driver_data(device);

			entry->owner = THIS_MODULE;

		}

	}



	return 0;

drivers/acpi/ec.c

+3 −8
Original line number Diff line number Diff line
@@ -669,16 +669,11 @@ static int acpi_ec_add_fs(struct acpi_device *device) 
			return -ENODEV;

	}



	entry = create_proc_entry(ACPI_EC_FILE_INFO, S_IRUGO,

				  acpi_device_dir(device));

	entry = proc_create_data(ACPI_EC_FILE_INFO, S_IRUGO,

				 acpi_device_dir(device),

				 &acpi_ec_info_ops, acpi_driver_data(device));

	if (!entry)

		return -ENODEV;

	else {

		entry->proc_fops = &acpi_ec_info_ops;

		entry->data = acpi_driver_data(device);

		entry->owner = THIS_MODULE;

	}



	return 0;

}

drivers/acpi/event.c

+4 −4
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ static unsigned int acpi_system_poll_event(struct file *file, poll_table * wait) 
}



static const struct file_operations acpi_system_event_ops = {

	.owner = THIS_MODULE,

	.open = acpi_system_open_event,

	.read = acpi_system_read_event,

	.release = acpi_system_close_event,
@@ -294,10 +295,9 @@ static int __init acpi_event_init(void) 


#ifdef CONFIG_ACPI_PROC_EVENT

	/* 'event' [R] */

	entry = create_proc_entry("event", S_IRUSR, acpi_root_dir);

	if (entry)

		entry->proc_fops = &acpi_system_event_ops;

	else

	entry = proc_create("event", S_IRUSR, acpi_root_dir,

			    &acpi_system_event_ops);

	if (!entry)

		return -ENODEV;

#endif