From patchwork Wed Dec 4 17:53:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 180826 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp931455ile; Wed, 4 Dec 2019 10:02:34 -0800 (PST) X-Google-Smtp-Source: APXvYqyZ0GT5Ld4ygAsGmR7x5Slz5pLDSk6+z840IGJbBy5HJPsA0VNA7sADcVKx1oKsAYvxspc2 X-Received: by 2002:a9d:7ad9:: with SMTP id m25mr3353817otn.13.1575482554151; Wed, 04 Dec 2019 10:02:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575482554; cv=none; d=google.com; s=arc-20160816; b=TsC1SpuuCXUShuWOjK+QC/8Y5Fv7SmK7HLmRiFLfUWwWCMG0SE7gWoWUdYGuVUek8Y QmUmbfO//KbbVuXyWDCPU9cgn5bx48W028j3aD+J4XbxFxhucqA5Gr0DuLc/f3wSJaL9 UUfVunEcZysLBOqNbQEBRdyEp1R70mePpQD0wFxuhu5fIquhLgYdUNI+4Ki2XerbSntH 4pisVVh8c5lEd3BsH0UkKRTSYMdhMEz4SHM5tQoy7qxEABrdY0nt2eR/K6EPdoLre36w TBp8brSd9uMJHUy9wLIJ+YmVszJrE/lvzGR4iIVqMedgdRT20GHHaPSF2DEtKtfplAUC U1sw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=7apfMWc7+iBPXflcnbpPV1gMYb1u9HMD73LN9kKs2H8=; b=TgJC5xVjRTMSHvDydd1pVKVSBh+Sp1PuTEkOsTL4ZdP87tbSrk77Zfmc4zWG8ZCqV1 pL8nho6qm6+En9/qTehWy8hfYriwziVHP8cPFKiW7eSPx2HDuRnLI9sC3OAf+AmE/dVU qElOV8FDyorlB2xMUOIiFvnuhoWgx3NJ3DTONd9M9NfWbAKUYX42uBoHaf687sx/DRED Z83kfCU2OuTTUVB0IINtud3UY+W8dgpVZ8J1eF2a0P6MimlXxcxEIKfcbLu5bq5GzPsy sA1dY0l3g877iRGCNVveViVSl+LFzXqbAhqkwkTzQzCnvfyfWu4On6C8mmla8D6ElrBB f9Dw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=IRtJ2oxY; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 v141si3660202oif.161.2019.12.04.10.02.33; Wed, 04 Dec 2019 10:02:34 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=IRtJ2oxY; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729420AbfLDSCc (ORCPT + 15 others); Wed, 4 Dec 2019 13:02:32 -0500 Received: from mail.kernel.org ([198.145.29.99]:44660 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729863AbfLDSCb (ORCPT ); Wed, 4 Dec 2019 13:02:31 -0500 Received: from localhost (unknown [217.68.49.72]) (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 7790120866; Wed, 4 Dec 2019 18:02:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575482550; bh=J8YqXj3SwtR7lM9NynpzL7p4eJ8MbvZczN68aP0uE04=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IRtJ2oxYxdZ9XFsI/eHSk7yG/A0E4euJUnMCWt1LWebTyRKwJ1vtfeWN6kDPJYInL +AalqjCZVT8KwMr6YPUTDF9BLvODvZqIbUCK8WxrGZNF8aya7KMMEQQG8nwLGDPRfa SH2xvum2s0xU13n4RYxvNn2vHldLkzilJQT5mhlc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kishon Vijay Abraham I , Philipp Zabel , Sasha Levin Subject: [PATCH 4.14 004/209] reset: Fix memory leak in reset_control_array_put() Date: Wed, 4 Dec 2019 18:53:36 +0100 Message-Id: <20191204175321.893517687@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191204175321.609072813@linuxfoundation.org> References: <20191204175321.609072813@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Kishon Vijay Abraham I [ Upstream commit 532f9cd6ee994ed10403e856ca27501428048597 ] Memory allocated for 'struct reset_control_array' in of_reset_control_array_get() is never freed in reset_control_array_put() resulting in kmemleak showing the following backtrace. backtrace: [<00000000c5f17595>] __kmalloc+0x1b0/0x2b0 [<00000000bd499e13>] of_reset_control_array_get+0xa4/0x180 [<000000004cc02754>] 0xffff800008c669e4 [<0000000050a83b24>] platform_drv_probe+0x50/0xa0 [<00000000d3a0b0bc>] really_probe+0x108/0x348 [<000000005aa458ac>] driver_probe_device+0x58/0x100 [<000000008853626c>] device_driver_attach+0x6c/0x90 [<0000000085308d19>] __driver_attach+0x84/0xc8 [<00000000080d35f2>] bus_for_each_dev+0x74/0xc8 [<00000000dd7f015b>] driver_attach+0x20/0x28 [<00000000923ba6e6>] bus_add_driver+0x148/0x1f0 [<0000000061473b66>] driver_register+0x60/0x110 [<00000000c5bec167>] __platform_driver_register+0x40/0x48 [<000000007c764b4f>] 0xffff800008c6c020 [<0000000047ec2e8c>] do_one_initcall+0x5c/0x1b0 [<0000000093d4b50d>] do_init_module+0x54/0x1d0 Fixes: 17c82e206d2a ("reset: Add APIs to manage array of resets") Signed-off-by: Kishon Vijay Abraham I Signed-off-by: Philipp Zabel Signed-off-by: Sasha Levin --- drivers/reset/core.c | 1 + 1 file changed, 1 insertion(+) -- 2.20.1 diff --git a/drivers/reset/core.c b/drivers/reset/core.c index 72b96b5c75a8f..7e0a14211c88a 100644 --- a/drivers/reset/core.c +++ b/drivers/reset/core.c @@ -513,6 +513,7 @@ static void reset_control_array_put(struct reset_control_array *resets) for (i = 0; i < resets->num_rstcs; i++) __reset_control_put_internal(resets->rstc[i]); mutex_unlock(&reset_list_mutex); + kfree(resets); } /**