From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754335AbbHEWxw (ORCPT ); Wed, 5 Aug 2015 18:53:52 -0400 Received: from v094114.home.net.pl ([79.96.170.134]:45194 "HELO v094114.home.net.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1752973AbbHEWxv (ORCPT ); Wed, 5 Aug 2015 18:53:51 -0400 From: "Rafael J. Wysocki" To: Andy Shevchenko Cc: "Rafael J . Wysocki" , Greg Kroah-Hartman , linux-kernel@vger.kernel.org Subject: Re: [PATCH 1/1] device property: fix potential NULL pointer dereference Date: Thu, 06 Aug 2015 01:20:56 +0200 Message-ID: <1461784.GDeppdBeAX@vostro.rjw.lan> User-Agent: KMail/4.11.5 (Linux/4.1.0-rc5+; KDE/4.11.5; x86_64; ; ) In-Reply-To: <1438782671-10337-1-git-send-email-andriy.shevchenko@linux.intel.com> References: <1438782671-10337-1-git-send-email-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="utf-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wednesday, August 05, 2015 04:51:11 PM Andy Shevchenko wrote: > In device_add_property_set() we check pset parameter for a NULL, but few lines > later we do a pointer arithmetic without check that will crash kernel in the > set_secondary_fwnode(). > > Here we check if pset parameter is NULL and return immediately. > > Fixes: 16ba08d5c9ec (device property: Introduce firmware node type for platform data) > Signed-off-by: Andy Shevchenko I don't think there are any users of this in 4.2, so I'll queue it up for 4.3. Thanks! > --- > drivers/base/property.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/base/property.c b/drivers/base/property.c > index f3f6d16..37a7bb7 100644 > --- a/drivers/base/property.c > +++ b/drivers/base/property.c > @@ -27,9 +27,10 @@ > */ > void device_add_property_set(struct device *dev, struct property_set *pset) > { > - if (pset) > - pset->fwnode.type = FWNODE_PDATA; > + if (!pset) > + return; > > + pset->fwnode.type = FWNODE_PDATA; > set_secondary_fwnode(dev, &pset->fwnode); > } > EXPORT_SYMBOL_GPL(device_add_property_set); > -- I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center.