From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753293AbbC3Iz0 (ORCPT ); Mon, 30 Mar 2015 04:55:26 -0400 Received: from mail-wg0-f46.google.com ([74.125.82.46]:33855 "EHLO mail-wg0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753256AbbC3IzV (ORCPT ); Mon, 30 Mar 2015 04:55:21 -0400 From: Ricardo Ribalda Delgado To: Bryan Wu , Richard Purdie , linux-leds@vger.kernel.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven Cc: Ricardo Ribalda Delgado Subject: [PATCH 2/3] leds/class: Check snprintf return value Date: Mon, 30 Mar 2015 10:55:11 +0200 Message-Id: <1427705712-18083-3-git-send-email-ricardo.ribalda@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1427705712-18083-1-git-send-email-ricardo.ribalda@gmail.com> References: <1427705712-18083-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 If the final name does not fit the string there is a potential endless-loop. Reported-by: Geert Uytterhoeven Signed-off-by: Ricardo Ribalda Delgado --- drivers/leds/led-class.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c index 294d6d6..2ffe8b1 100644 --- a/drivers/leds/led-class.c +++ b/drivers/leds/led-class.c @@ -223,12 +223,17 @@ static int led_classdev_next_name(const char *init_name, char *name, size_t len) { int i = 0; + int ret = 0; strlcpy(name, init_name, len); - while (class_find_device(leds_class, NULL, name, match_name)) + while (class_find_device(leds_class, NULL, name, match_name) && + (ret < len)) snprintf(name, len, "%s_%d", init_name, ++i); + if (ret >= len) + return -ENOMEM; + return i; } @@ -243,6 +248,9 @@ int led_classdev_register(struct device *parent, struct led_classdev *led_cdev) int ret; ret = led_classdev_next_name(led_cdev->name, name, sizeof(name)); + if (ret < 0) + return ret; + led_cdev->dev = device_create_with_groups(leds_class, parent, 0, led_cdev, led_cdev->groups, "%s", name); if (IS_ERR(led_cdev->dev)) -- 2.1.4