From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932749AbZINSSh (ORCPT ); Mon, 14 Sep 2009 14:18:37 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932736AbZINSSd (ORCPT ); Mon, 14 Sep 2009 14:18:33 -0400 Received: from e6.ny.us.ibm.com ([32.97.182.146]:55940 "EHLO e6.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932733AbZINSSc (ORCPT ); Mon, 14 Sep 2009 14:18:32 -0400 Message-ID: <4AAE88F7.3010707@austin.ibm.com> Date: Mon, 14 Sep 2009 13:18:31 -0500 From: Nathan Fontenot User-Agent: Thunderbird 2.0.0.23 (X11/20090817) MIME-Version: 1.0 To: Nathan Fontenot , linuxppc-dev@ozlabs.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 4/5] kernel handling of memory DLPAR References: <4AAABC55.4070207@austin.ibm.com> <4AAABDBB.7010400@austin.ibm.com> <20090914063911.GB13139@centrinvest.ru> In-Reply-To: <20090914063911.GB13139@centrinvest.ru> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Andrey Panin wrote: > On 254, 09 11, 2009 at 04:14:35PM -0500, Nathan Fontenot wrote: >> This adds the capability to DLPAR add and remove memory from the kernel. The >> patch extends the powerpc handling of memory_add_physaddr_to_nid(), which is >> called from the sysfs memory 'probe' file to first ensure that the memory >> has been added to the system. This is done by creating a platform specific >> callout from the routine. The pseries implementation of this handles the >> DLPAR work to add the memory to the system and update the device tree. >> >> The patch also creates a pseries only 'release' sys file, >> /sys/devices/system/memory/release. This file handles the DLPAR >> release of >> memory back to firmware and updating of the device-tree. >> >> Signed-off-by: Nathan Fontenot > >> +static struct property *clone_property(struct property *old_prop) >> +{ >> + struct property *new_prop; >> + >> + new_prop = kzalloc((sizeof *new_prop), GFP_KERNEL); >> + if (!new_prop) >> + return NULL; >> + >> + new_prop->name = kzalloc(strlen(old_prop->name) + 1, GFP_KERNEL); >> + new_prop->value = kzalloc(old_prop->length + 1, GFP_KERNEL); > > Memory leak here. What if one kzalloc() succeeded and another failed ? > This should be fine. The free_property routine will free the name or value fields if they are allocated. -Nathan >> + if (!new_prop->name || !new_prop->value) { >> + free_property(new_prop); >> + return NULL; >> + } >> + >> + strcpy(new_prop->name, old_prop->name); >> + memcpy(new_prop->value, old_prop->value, old_prop->length); >> + new_prop->length = old_prop->length; >> + >> + return new_prop; >> +}