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=-8.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, 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 9D3FCC0044C for ; Mon, 29 Oct 2018 23:21:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2AD5E2064C for ; Mon, 29 Oct 2018 23:21:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2AD5E2064C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=canonical.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730974AbeJ3IMv (ORCPT ); Tue, 30 Oct 2018 04:12:51 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:36999 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730659AbeJ3IMv (ORCPT ); Tue, 30 Oct 2018 04:12:51 -0400 Received: from 1.general.cking.uk.vpn ([10.172.193.212] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1gHGqw-0002nf-Qe; Mon, 29 Oct 2018 23:21:46 +0000 From: Colin King To: Richard Weinberger , Artem Bityutskiy , Adrian Hunter , linux-mtd@lists.infradead.org Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH][next] ubifs: authentication: fix memory leak on error exit path Date: Mon, 29 Oct 2018 23:21:46 +0000 Message-Id: <20181029232146.21262-1-colin.king@canonical.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Colin Ian King Currently a failure when calling ubifs_read_nnode results in a leak of desc and buf because of a direct return. Fix this by exiting via label 'out' that performs the necessary free'ing of the resources. Fixes: a1dc58140f7e ("ubifs: authentication: Authenticate LPT") Signed-off-by: Colin Ian King --- fs/ubifs/lpt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/ubifs/lpt.c b/fs/ubifs/lpt.c index d1d5e96350dd..c162459a1e02 100644 --- a/fs/ubifs/lpt.c +++ b/fs/ubifs/lpt.c @@ -1688,7 +1688,7 @@ int ubifs_lpt_calc_hash(struct ubifs_info *c, u8 *hash) if (!c->nroot) { err = ubifs_read_nnode(c, NULL, 0); if (err) - return err; + goto out; } cnode = (struct ubifs_cnode *)c->nroot; -- 2.19.1