From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933383Ab3HNVYd (ORCPT ); Wed, 14 Aug 2013 17:24:33 -0400 Received: from mail-la0-f46.google.com ([209.85.215.46]:63354 "EHLO mail-la0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933221Ab3HNVYO (ORCPT ); Wed, 14 Aug 2013 17:24:14 -0400 From: Ricardo Ribalda Delgado To: Bryan Wu , Peter Meerwald , Richard Purdie , Linux LED Subsystem , LKML Cc: Ricardo Ribalda Delgado Subject: [PATCH v5 5/5] leds-pca963x: Fix device tree parsing Date: Wed, 14 Aug 2013 23:23:51 +0200 Message-Id: <1376515431-9504-6-git-send-email-ricardo.ribalda@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1376515431-9504-1-git-send-email-ricardo.ribalda@gmail.com> References: <1376515431-9504-1-git-send-email-ricardo.ribalda@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org A malformed device tree could lead into a segmentation fault if the reg value of a led is bigger than the number of leds. A valid device tree could have only information about the last led of the chip. Fix the device tree parsing to handle those cases. Signed-off-by: Ricardo Ribalda Delgado --- drivers/leds/leds-pca963x.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/leds/leds-pca963x.c b/drivers/leds/leds-pca963x.c index 35d56a6..82589c0 100644 --- a/drivers/leds/leds-pca963x.c +++ b/drivers/leds/leds-pca963x.c @@ -285,13 +285,13 @@ pca963x_dt_init(struct i2c_client *client, struct pca963x_chipdef *chip) u32 reg; int res; + res = of_property_read_u32(child, "reg", ®); + if ((res != 0) || (reg >= chip->n_leds)) + continue; led.name = of_get_property(child, "label", NULL) ? : child->name; led.default_trigger = of_get_property(child, "linux,default-trigger", NULL); - res = of_property_read_u32(child, "reg", ®); - if (res != 0) - continue; pca963x_leds[reg] = led; } pdata = devm_kzalloc(&client->dev, @@ -300,7 +300,7 @@ pca963x_dt_init(struct i2c_client *client, struct pca963x_chipdef *chip) return ERR_PTR(-ENOMEM); pdata->leds.leds = pca963x_leds; - pdata->leds.num_leds = count; + pdata->leds.num_leds = chip->n_leds; /* default to open-drain unless totem pole (push-pull) is specified */ if (of_property_read_bool(np, "nxp,totem-pole")) -- 1.7.10.4