Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp2992761imu; Sun, 9 Dec 2018 14:31:39 -0800 (PST) X-Google-Smtp-Source: AFSGD/XN1gxUoc8W6qfq5swopz8RjMz8rvMOux+lgklco0exR2+OXpvfXMSUnpb+f2Iq2rm9Nneo X-Received: by 2002:a63:b4c:: with SMTP id a12mr8981631pgl.131.1544394699527; Sun, 09 Dec 2018 14:31:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544394699; cv=none; d=google.com; s=arc-20160816; b=zVrsaRXvZmSNXXmJD3beeesQZGtN1taYpPn4alQwBvariR+/6LCjxpk+7J6cyLssgC mhoRbsCvjm3l/X0oEP3xCxn4vLhitbpTvOtMBsji9uyqXJmTKTSSLPA4H9wDBsWwv0Jb dZAkvBJODH6RekLd2QliQpBdlXyY2OX1LP8fQXwpvHfaXu7eczMlIt4EZRfUw/B5MqfU OtjHb2iZ7+6ZQSJ44XCx5Zmi+k0isUiQyBD/YjporEtPoA1NzLlc+XixbCacO/QCKqYE UaeLR2tKazbdGfDfwDaGE7yJKju3se8AD3ogz0HXTSuU1Ez/pWUFtTx/HpF4nw4mY+Id AAcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:in-reply-to:subject:message-id:date:cc:to :from:mime-version:content-transfer-encoding:content-disposition; bh=OPFMB2Np1Jai+ajo48DNFB+7JQfIM3acW6B/T3BqeJ8=; b=ttY4gG5aPRTt1s0LadSkfUYcPPzKHqiedqCDEewCE/32yTJDOFapX0nGuvilyFQfOk wtDfolu+JwheBe+hBRodnWrBYI6DPuEWpPLHmrGHpbECD+W+YDft5zskWJy+rmuRBWk3 DsEpVMFlXqaVr2mdaUSGr0ddM6e0+RSAGNGNI3w2LtXX1+gWctv3uqKCA0nQ/P5nhKMv 2AODx+mFrm45qLxjabHkCL+GbMo5lEGFxULt2z6Ar7xw5Vv4EVaYdxTG0ZniMFXqkKt5 NkEq3nPOLQWtdoqoDfnNHgI7E/VaXEpnNBlfn2cHPOkjZmbz+jtPdB9nKd4Dd/XgpYou kLTA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p26si9111953pfj.244.2018.12.09.14.31.24; Sun, 09 Dec 2018 14:31:39 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728289AbeLIW33 (ORCPT + 99 others); Sun, 9 Dec 2018 17:29:29 -0500 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:34562 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726326AbeLIVzJ (ORCPT ); Sun, 9 Dec 2018 16:55:09 -0500 Received: from pub.yeoldevic.com ([81.174.156.145] helo=deadeye) by shadbolt.decadent.org.uk with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1gW72Y-0002il-Re; Sun, 09 Dec 2018 21:55:06 +0000 Received: from ben by deadeye with local (Exim 4.91) (envelope-from ) id 1gW72Y-0003D8-57; Sun, 09 Dec 2018 21:55:06 +0000 Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 From: Ben Hutchings To: linux-kernel@vger.kernel.org, stable@vger.kernel.org CC: akpm@linux-foundation.org, "Takashi Iwai" , "Nicholas Mc Guire" Date: Sun, 09 Dec 2018 21:50:33 +0000 Message-ID: X-Mailer: LinuxStableQueue (scripts by bwh) X-Patchwork-Hint: ignore Subject: [PATCH 3.16 013/328] ALSA: snd-aoa: add of_node_put() in error path In-Reply-To: X-SA-Exim-Connect-IP: 81.174.156.145 X-SA-Exim-Mail-From: ben@decadent.org.uk X-SA-Exim-Scanned: No (on shadbolt.decadent.org.uk); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.16.62-rc1 review patch. If anyone has any objections, please let me know. ------------------ From: Nicholas Mc Guire commit 222bce5eb88d1af656419db04bcd84b2419fb900 upstream. Both calls to of_find_node_by_name() and of_get_next_child() return a node pointer with refcount incremented thus it must be explicidly decremented here after the last usage. As we are assured to have a refcounted np either from the initial of_find_node_by_name(NULL, name); or from the of_get_next_child(gpio, np) in the while loop if we reached the error code path below, an x of_node_put(np) is needed. Signed-off-by: Nicholas Mc Guire Fixes: commit f3d9478b2ce4 ("[ALSA] snd-aoa: add snd-aoa") Signed-off-by: Takashi Iwai Signed-off-by: Ben Hutchings --- sound/aoa/core/gpio-feature.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/sound/aoa/core/gpio-feature.c +++ b/sound/aoa/core/gpio-feature.c @@ -88,8 +88,10 @@ static struct device_node *get_gpio(char } reg = of_get_property(np, "reg", NULL); - if (!reg) + if (!reg) { + of_node_put(np); return NULL; + } *gpioptr = *reg;