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

Commit 2e99f3a1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'acpi-fixes-3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull ACPICA fixes from Rafael Wysocki:

 - _INI regression fix from Tomasz Nowicki.

 - Fix for a possible memory leak in _OSI support routine from Jung-uk
   Kim.

 - Fix for a possible buffer overflow during field unit read operation
   from Bob Moore.

* tag 'acpi-fixes-3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPICA: ACPICA: Fix for _INI regression
  ACPICA: _OSI support: Fix possible memory leak
  ACPICA: Fix possible buffer overflow during a field unit read operation
parents fc72053b 04a29a15

drivers/acpi/acpica/exfldio.c

+13 −1
Original line number Diff line number Diff line
@@ -720,7 +720,19 @@ acpi_ex_extract_from_field(union acpi_operand_object *obj_desc, 


	if ((obj_desc->common_field.start_field_bit_offset == 0) &&

	    (obj_desc->common_field.bit_length == access_bit_width)) {

		status = acpi_ex_field_datum_io(obj_desc, 0, buffer, ACPI_READ);

		if (buffer_length >= sizeof(u64)) {

			status =

			    acpi_ex_field_datum_io(obj_desc, 0, buffer,

						   ACPI_READ);

		} else {

			/* Use raw_datum (u64) to handle buffers < 64 bits */



			status =

			    acpi_ex_field_datum_io(obj_desc, 0, &raw_datum,

						   ACPI_READ);

			ACPI_MEMCPY(buffer, &raw_datum, buffer_length);

		}



		return_ACPI_STATUS(status);

	}

drivers/acpi/acpica/nsinit.c

+1 −0
Original line number Diff line number Diff line
@@ -558,6 +558,7 @@ acpi_ns_init_one_device(acpi_handle obj_handle, 
	ACPI_DEBUG_EXEC(acpi_ut_display_init_pathname

			(ACPI_TYPE_METHOD, device_node, METHOD_NAME__INI));



	ACPI_MEMSET(info, 0, sizeof(struct acpi_evaluate_info));

	info->prefix_node = device_node;

	info->pathname = METHOD_NAME__INI;

	info->parameters = NULL;

drivers/acpi/acpica/utosi.c

+2 −1
Original line number Diff line number Diff line
@@ -349,7 +349,8 @@ acpi_status acpi_ut_osi_implementation(struct acpi_walk_state * walk_state) 
	return_value = 0;

	status = acpi_os_acquire_mutex(acpi_gbl_osi_mutex, ACPI_WAIT_FOREVER);

	if (ACPI_FAILURE(status)) {

		return (status);

		acpi_ut_remove_reference(return_desc);

		return_ACPI_STATUS(status);

	}



	/* Lookup the interface in the global _OSI list */