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.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,T_DKIMWL_WL_HIGH,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 C6743C04AAA for ; Thu, 2 May 2019 15:27:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 97C53216FD for ; Thu, 2 May 2019 15:27:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556810864; bh=33DfFVh2yxT0x0HSG+r+lSFhiTA9VvXInOASHfZqEo8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=mNssqwg3fSCqIUfbadsMrforQZGNcvPQ4E6XYIPjUM2kNAG80svcj9sNZw0pgYnef i8ubzc+t52Ag2WLh2WAADpbj7jeyhjweTU5l0ATgbUK+ZKk6oOV2zvTxdzlXOkM1Cz HK+Mjda40IzC/oQLBKs5fsSWqozSjEjHSTSiJ1Fs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728048AbfEBP1n (ORCPT ); Thu, 2 May 2019 11:27:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:44642 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728045AbfEBP1n (ORCPT ); Thu, 2 May 2019 11:27:43 -0400 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 E518B2081C; Thu, 2 May 2019 15:27:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556810862; bh=33DfFVh2yxT0x0HSG+r+lSFhiTA9VvXInOASHfZqEo8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=K+sXNQpeDga6Zt1FwJR1vmaV1dsDSHwKouC+CwqTf3C8tvvmljnp4Fo/YuD6icU7K 4ZddK6De8LS98UjjmwBi++QBrhlwmhvZX8rh+1tQle+SzKX7mqzH6lcJ8BNz87wadq 9Zi/2qgXkfXQ1x2dON4yorsHei909Fy2PpF8rKZg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kangjie Lu , Andrew Jeffery , Bartosz Golaszewski , "Sasha Levin (Microsoft)" Subject: [PATCH 4.19 50/72] gpio: aspeed: fix a potential NULL pointer dereference Date: Thu, 2 May 2019 17:21:12 +0200 Message-Id: <20190502143337.409782370@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190502143333.437607839@linuxfoundation.org> References: <20190502143333.437607839@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit 6cf4511e9729c00a7306cf94085f9cc3c52ee723 ] In case devm_kzalloc, the patch returns ENOMEM to avoid potential NULL pointer dereference. Signed-off-by: Kangjie Lu Reviewed-by: Andrew Jeffery Signed-off-by: Bartosz Golaszewski Signed-off-by: Sasha Levin (Microsoft) --- drivers/gpio/gpio-aspeed.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpio/gpio-aspeed.c b/drivers/gpio/gpio-aspeed.c index 2342e154029b..b696ec35efb3 100644 --- a/drivers/gpio/gpio-aspeed.c +++ b/drivers/gpio/gpio-aspeed.c @@ -1225,6 +1225,8 @@ static int __init aspeed_gpio_probe(struct platform_device *pdev) gpio->offset_timer = devm_kzalloc(&pdev->dev, gpio->chip.ngpio, GFP_KERNEL); + if (!gpio->offset_timer) + return -ENOMEM; return aspeed_gpio_setup_irqs(gpio, pdev); } -- 2.19.1