From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dmitry Torokhov Subject: Re: [PATCH v2 3/4] driver property: constify property arrays values Date: Wed, 1 Feb 2017 09:09:24 -0800 Message-ID: <20170201170924.GA40045@dtor-ws> References: <20170201021130.20586-1-dmitry.torokhov@gmail.com> <20170201021130.20586-4-dmitry.torokhov@gmail.com> <20170201144233.GN17297@lahna.fi.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mail-pg0-f67.google.com ([74.125.83.67]:35461 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752800AbdBARJ2 (ORCPT ); Wed, 1 Feb 2017 12:09:28 -0500 Content-Disposition: inline In-Reply-To: <20170201144233.GN17297@lahna.fi.intel.com> Sender: linux-acpi-owner@vger.kernel.org List-Id: linux-acpi@vger.kernel.org To: Mika Westerberg Cc: "Rafael J. Wysocki" , linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, Andy Shevchenko , Hans de Goede , Wolfram Sang On Wed, Feb 01, 2017 at 04:42:33PM +0200, Mika Westerberg wrote: > On Tue, Jan 31, 2017 at 06:11:29PM -0800, Dmitry Torokhov wrote: > > Data that is fed into property arrays should not be modified, so let's mark > > relevant pointers as const. This will allow us making source arrays as > > const/__initconst. > > > > Also fix memory leaks on errors in property_entry_copy(). > > > > Signed-off-by: Dmitry Torokhov > > --- > > drivers/base/property.c | 65 +++++++++++++++++++++++++++++++++--------------- > > include/linux/property.h | 12 ++++----- > > 2 files changed, 51 insertions(+), 26 deletions(-) > > > > diff --git a/drivers/base/property.c b/drivers/base/property.c > > index edc09854520b..fd91e0891665 100644 > > --- a/drivers/base/property.c > > +++ b/drivers/base/property.c > > @@ -682,44 +682,65 @@ int fwnode_property_match_string(struct fwnode_handle *fwnode, > > } > > EXPORT_SYMBOL_GPL(fwnode_property_match_string); > > > > +static int property_copy_string_array(struct property_entry *dst, > > + const struct property_entry *src) > > +{ > > + char **d; > > + size_t nval = src->length / sizeof(*d); > > + size_t i; > > + > > + d = kcalloc(nval, sizeof(*d), GFP_KERNEL); > > + if (!d) > > + return -ENOMEM; > > + > > + for (i = 0; i < nval; i++) { > > + d[i] = kstrdup(src->pointer.str[i], GFP_KERNEL); > > + if (!d[i] && src->pointer.str[i]) { > > + while (--i >= 0) > > + kfree(d[i]); > > Should we free d as well here? Yep. > > > + return -ENOMEM; > > + } > > + } > > + > > + dst->pointer.str = (void *)d; > > + return 0; > > +} -- Dmitry