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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 54DD9C47254 for ; Fri, 8 May 2020 13:17:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2DFE92496F for ; Fri, 8 May 2020 13:17:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588943869; bh=RevHL6/ppsU+ZB24KHRGsVR2GQXsknbXP3xp1aWcpXQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=YfqmdX9HY4GpoWNI1GdJE2Sh9y7y5JR2eyG6UojALpy150Ji61CIeJw14QYqFpych CArpNsZdUew1C6FGEmGB+TUJHJL0qPMaz2xfp08+XgNTS3wDvXzNpALMzGJWCvMoDe C7BHjCGif5EXpAzK7WsaE0baOneqk/dGT54Xl5sA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730275AbgEHNRk (ORCPT ); Fri, 8 May 2020 09:17:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:41746 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729106AbgEHMnq (ORCPT ); Fri, 8 May 2020 08:43:46 -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 DEEEB206B8; Fri, 8 May 2020 12:43:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588941825; bh=RevHL6/ppsU+ZB24KHRGsVR2GQXsknbXP3xp1aWcpXQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BDzjNUDj+tO/hHOxJMM4mZRUNkMRuXNTkkNg+CmzBwvPH1ncfWob5i/cte5WCNIKr AlzW8xMLfTEhXz4NqyWA8xhzoTH9M2ZKkhQ3Rc2aLGMXLf/HtweBf7ybdyDk02aH2d yflFghPCs9yrZLNXoDx5x78r6bSOOvzUUPXtINhw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Stefan Wahren , Eric Anholt , Linus Walleij Subject: [PATCH 4.4 185/312] pinctrl: bcm2835: Fix memory leak in error path Date: Fri, 8 May 2020 14:32:56 +0200 Message-Id: <20200508123137.489910835@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200508123124.574959822@linuxfoundation.org> References: <20200508123124.574959822@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 From: Stefan Wahren commit 53653c6b91750debba6dc4503003c851257fd340 upstream. In case of an invalid pin value bcm2835_pctl_dt_node_to_map() would leak the pull configs of already assigned pins. So avoid this by calling the free map function in error case. Signed-off-by: Stefan Wahren Fixes: e1b2dc70cd5b ("pinctrl: add bcm2835 driver") Reviewed-by: Eric Anholt Signed-off-by: Linus Walleij Signed-off-by: Greg Kroah-Hartman --- drivers/pinctrl/bcm/pinctrl-bcm2835.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c +++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c @@ -795,7 +795,7 @@ static int bcm2835_pctl_dt_node_to_map(s return 0; out: - kfree(maps); + bcm2835_pctl_dt_free_map(pctldev, maps, num_pins * maps_per_pin); return err; }