From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751871AbdBAOtQ (ORCPT ); Wed, 1 Feb 2017 09:49:16 -0500 Received: from mga05.intel.com ([192.55.52.43]:15901 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750926AbdBAOtO (ORCPT ); Wed, 1 Feb 2017 09:49:14 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,320,1477983600"; d="scan'208";a="1101645220" Date: Wed, 1 Feb 2017 16:42:33 +0200 From: Mika Westerberg To: Dmitry Torokhov Cc: "Rafael J. Wysocki" , linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, Andy Shevchenko , Hans de Goede , Wolfram Sang Subject: Re: [PATCH v2 3/4] driver property: constify property arrays values Message-ID: <20170201144233.GN17297@lahna.fi.intel.com> References: <20170201021130.20586-1-dmitry.torokhov@gmail.com> <20170201021130.20586-4-dmitry.torokhov@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170201021130.20586-4-dmitry.torokhov@gmail.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo User-Agent: Mutt/1.7.1 (2016-10-04) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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? > + return -ENOMEM; > + } > + } > + > + dst->pointer.str = (void *)d; > + return 0; > +}