From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 578CFC432C0 for ; Tue, 19 Nov 2019 05:25:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2D427222A2 for ; Tue, 19 Nov 2019 05:25:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141123; bh=RKL08migMu51xsRs1iJEu3044H5qvogPiaGNG3IZNGI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=UlBJOyeljnK4/9TdySDfmWFWh3cXSkOy1eC493d+vdyFhWW7W2xwkKHuMAfoqFfX5 y8obVkGo7ZgqcyCGazq9kUMM/SrovQrnL11YA+KyNAygXtwl5Smcv/F+T5IZ0EH66i PQELuYycGhemUPQzECcNvUyWYYZAoy9sjhLjfDVs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728373AbfKSFZV (ORCPT ); Tue, 19 Nov 2019 00:25:21 -0500 Received: from mail.kernel.org ([198.145.29.99]:42524 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727684AbfKSFZT (ORCPT ); Tue, 19 Nov 2019 00:25:19 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1426421783; Tue, 19 Nov 2019 05:25:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141118; bh=RKL08migMu51xsRs1iJEu3044H5qvogPiaGNG3IZNGI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xWohNOj76Uepl8AIZRnbT9o6sH08OiiohYEWTiWP7LNpZ8ukwIpdRel5w22fXZn6k aY1e+ffdR8KfIDr+7UJyOAoOPuoCZyEDaUgoek8UXRk0k4qzyfl09EmdJAOhJGwSqr 3QS1FZPdMYJZcJvHhZ7GLHEr+9fnhXqUhG32ak5U= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , Alexandre Belloni , Sasha Levin Subject: [PATCH 4.19 049/422] rtc: sysfs: fix NULL check in rtc_add_groups() Date: Tue, 19 Nov 2019 06:14:06 +0100 Message-Id: <20191119051403.030227968@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dan Carpenter [ Upstream commit 777d8ae56da18fb6440acd941edb3597c1b02bf0 ] devm_kcalloc() returns NULL, it never returns error pointers. In the current code we would return PTR_ERR(NULL) which is success, instead of returning the -ENOMEM error code. Fixes: a0a1a1ba3032 ("rtc: sysfs: facilitate attribute add to rtc device") Signed-off-by: Dan Carpenter Signed-off-by: Alexandre Belloni Signed-off-by: Sasha Levin --- drivers/rtc/rtc-sysfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/rtc/rtc-sysfs.c b/drivers/rtc/rtc-sysfs.c index f1ff30ade5343..9746c32eee2eb 100644 --- a/drivers/rtc/rtc-sysfs.c +++ b/drivers/rtc/rtc-sysfs.c @@ -338,8 +338,8 @@ int rtc_add_groups(struct rtc_device *rtc, const struct attribute_group **grps) new_cnt = old_cnt + add_cnt + 1; groups = devm_kcalloc(&rtc->dev, new_cnt, sizeof(*groups), GFP_KERNEL); - if (IS_ERR_OR_NULL(groups)) - return PTR_ERR(groups); + if (!groups) + return -ENOMEM; memcpy(groups, rtc->dev.groups, old_cnt * sizeof(*groups)); memcpy(groups + old_cnt, grps, add_cnt * sizeof(*groups)); groups[old_cnt + add_cnt] = NULL; -- 2.20.1