linux-kernel - linux-next: manual merge of the akpm tree with the pm tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20121105154646.65ece287a8bd50e844085a9a@canb.auug.org.au>
Date:	Mon, 5 Nov 2012 15:46:46 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Wen Congyang <wency@...fujitsu.com>,
	Yasuaki Ishimatsu <isimatu.yasuaki@...fujitsu.com>,
	"Rafael J. Wysocki" <rjw@...k.pl>
Subject: linux-next: manual merge of the akpm tree with the pm tree

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
drivers/acpi/acpi_memhotplug.c between commits 85fcb3758c10 ("ACPI /
memory-hotplug: introduce a mutex lock to protect the list in
acpi_memory_device") and d0fbb400b6f3 ("ACPI / memory-hotplug: add memory
offline code to acpi_memory_device_remove()") from the pm tree and commit
"acpi_memhotplug.c: fix memory leak when memory device is unbound from
the module acpi_memhotplug" from the akpm tree.

I fixed it up (I think - see below) and can carry the fix as necessary
(no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/acpi/acpi_memhotplug.c
index 92c973a,62c2c74..0000000
--- a/drivers/acpi/acpi_memhotplug.c
+++ b/drivers/acpi/acpi_memhotplug.c
@@@ -131,6 -125,16 +131,18 @@@ acpi_memory_get_resource(struct acpi_re
  	return AE_OK;
  }
  
+ static void
+ acpi_memory_free_device_resources(struct acpi_memory_device *mem_device)
+ {
+ 	struct acpi_memory_info *info, *n;
+ 
++	mutex_lock(&mem_device->list_lock);
+ 	list_for_each_entry_safe(info, n, &mem_device->res_list, list)
+ 		kfree(info);
+ 	INIT_LIST_HEAD(&mem_device->res_list);
++	mutex_unlock(&mem_device->list_lock);
+ }
+ 
  static int
  acpi_memory_get_device_resources(struct acpi_memory_device *mem_device)
  {
@@@ -504,13 -490,7 +519,13 @@@ static int acpi_memory_device_remove(st
  	if (!device || !acpi_driver_data(device))
  		return -EINVAL;
  
 -	acpi_memory_device_free(acpi_driver_data(device));
 +	mem_device = acpi_driver_data(device);
 +
 +	result = acpi_memory_remove_memory(mem_device);
 +	if (result)
 +		return result;
 +
- 	kfree(mem_device);
++	acpi_memory_device_free(mem_device);
  
  	return 0;
  }

Content of type "application/pgp-signature" skipped