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.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,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 E3AEBC10F11 for ; Mon, 22 Apr 2019 19:54:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 97DAC204EC for ; Mon, 22 Apr 2019 19:54:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555962885; bh=z0e1JjdaI53nlbnnlkLdN919JGoaVDtJwG0JGWFVD7E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=yVNPzUB/Pt9/dlwbdesi/hfA67FzQKbKDqc388J6E2k0zYSOyC87Zdnop0+9ieHlb PKAzDyCDopOFt/H2oVD9JAdbVjsrPcC9oDRcPusaRCje7eIt/6WSFEk2NZkXlTXKK3 YfvDvcnhyuF0uOseACJ3ELasmYQ3o6ustl6QTG1w= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731512AbfDVTyo (ORCPT ); Mon, 22 Apr 2019 15:54:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:53480 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730899AbfDVTti (ORCPT ); Mon, 22 Apr 2019 15:49:38 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2174121738; Mon, 22 Apr 2019 19:49:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555962577; bh=z0e1JjdaI53nlbnnlkLdN919JGoaVDtJwG0JGWFVD7E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ScSXFfTlKvHqyavk8dPgIowDEUkdxyZCMicSJP/imKZ+kgD3r9GORY+ejCkD64G6u aVmZDdY4oDZIPOsLIxwwpFIovN+IyKTBB/MP9w2EF7Da+8rmsuydxgWB8vEFD3pVkh SYZQgEcS5Cg7GLaBrIelzb7CQZAxbBFV0xsA403w= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Geert Uytterhoeven , Linus Walleij , Sasha Levin , linux-gpio@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 27/29] gpio: of: Fix of_gpiochip_add() error path Date: Mon, 22 Apr 2019 15:48:46 -0400 Message-Id: <20190422194848.13049-27-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190422194848.13049-1-sashal@kernel.org> References: <20190422194848.13049-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Geert Uytterhoeven [ Upstream commit f7299d441a4da8a5088e651ea55023525a793a13 ] If the call to of_gpiochip_scan_gpios() in of_gpiochip_add() fails, no error handling is performed. This lead to the need of callers to call of_gpiochip_remove() on failure, which causes "BAD of_node_put() on ..." if the failure happened before the call to of_node_get(). Fix this by adding proper error handling. Note that calling gpiochip_remove_pin_ranges() multiple times causes no harm: subsequent calls are a no-op. Fixes: dfbd379ba9b7431e ("gpio: of: Return error if gpio hog configuration failed") Signed-off-by: Geert Uytterhoeven Reviewed-by: Mukesh Ojha Signed-off-by: Linus Walleij Signed-off-by: Sasha Levin (Microsoft) --- drivers/gpio/gpiolib-of.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c index aac84329c759..b863386be911 100644 --- a/drivers/gpio/gpiolib-of.c +++ b/drivers/gpio/gpiolib-of.c @@ -531,7 +531,13 @@ int of_gpiochip_add(struct gpio_chip *chip) of_node_get(chip->of_node); - return of_gpiochip_scan_gpios(chip); + status = of_gpiochip_scan_gpios(chip); + if (status) { + of_node_put(chip->of_node); + gpiochip_remove_pin_ranges(chip); + } + + return status; } void of_gpiochip_remove(struct gpio_chip *chip) -- 2.19.1