From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752946AbcLCPDC (ORCPT ); Sat, 3 Dec 2016 10:03:02 -0500 Received: from m50-134.163.com ([123.125.50.134]:46759 "EHLO m50-134.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752666AbcLCPDB (ORCPT ); Sat, 3 Dec 2016 10:03:01 -0500 From: Pan Bian To: "Rafael J. Wysocki" , Daniel Lezcano , linux-pm@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Pan Bian Subject: [PATCH 1/1] cpuidle: fix improper return value on error Date: Sat, 3 Dec 2016 23:02:27 +0800 Message-Id: <1480777347-7497-1-git-send-email-bianpan201602@163.com> X-Mailer: git-send-email 1.9.1 X-CM-TRANSID: DtGowABXPeWD3kJYyAU6Ig--.44818S3 X-Coremail-Antispam: 1Uf129KBjvJXoW7XrW7ZF4UWryfCryfCrW3ZFb_yoW8Jr1rpr WkG342kr4DW3yUGw47C3WUWryY934kXrW5WrZ5X3sxZa1DtFnY9FZ5trW7tF4kArWvkFy8 Aa1DKry3AF4jkF7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07bVku7UUUUU= X-Originating-IP: [222.131.246.88] X-CM-SenderInfo: held01tdqsiiqwqsqiywtou0bp/1tbiSAY14FXlhBHtmwAAsI Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Pan Bian In function cpuidle_add_state_sysfs(), variable ret takes the return value. Its value should be negative on errors. Because ret is reset in the loop, its value will be 0 during the second and after repeat of the loop. If kzalloc() returns a NULL pointer then, it will return 0. It may be better to explicitly assign "-ENOMEM" when the call to kzalloc() fails. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=188901 Signed-off-by: Pan Bian --- drivers/cpuidle/sysfs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c index 832a2c3..c5adc8c 100644 --- a/drivers/cpuidle/sysfs.c +++ b/drivers/cpuidle/sysfs.c @@ -403,8 +403,10 @@ static int cpuidle_add_state_sysfs(struct cpuidle_device *device) /* state statistics */ for (i = 0; i < drv->state_count; i++) { kobj = kzalloc(sizeof(struct cpuidle_state_kobj), GFP_KERNEL); - if (!kobj) + if (!kobj) { + ret = -ENOMEM; goto error_state; + } kobj->state = &drv->states[i]; kobj->state_usage = &device->states_usage[i]; init_completion(&kobj->kobj_unregister); -- 1.9.1