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.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,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 7703DC47409 for ; Mon, 10 Feb 2020 12:35:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 48A9021569 for ; Mon, 10 Feb 2020 12:35:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581338111; bh=st9TsZdPw82Mz8T1WRM9QxrU3J2URaUe4ARNlAB+lv0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=k9e8WYlQV4NZim0d/jnQoeVR2vCUZZ8OlrsckErZl/8epnJdBWt+eKtXghJloOSch 1fGNYHL1fDMQyQ3d+cSexe8rZMwWZUahnnSnlto3wLUU0C1k182jwxDPtVuFV5DguH 1Gh8LdGjd8fFWY9pIFSRRD+we0Fzmf7m7Anjkavc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727686AbgBJMfJ (ORCPT ); Mon, 10 Feb 2020 07:35:09 -0500 Received: from mail.kernel.org ([198.145.29.99]:51476 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727561AbgBJMfJ (ORCPT ); Mon, 10 Feb 2020 07:35:09 -0500 Received: from localhost (unknown [209.37.97.194]) (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 A06D020661; Mon, 10 Feb 2020 12:35:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581338107; bh=st9TsZdPw82Mz8T1WRM9QxrU3J2URaUe4ARNlAB+lv0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CA4VVFGf7ASSA7onjqClYocRKI6vNmMaabqqvK2Y8/zwzOYqY9ebA0/v8EM9J8u1i tuRourfgtbL9LiqO7bnZPjxMDd3oMk7XKPlpFVVDsy1VoABamk88cpDe6qIyM7+0A6 s7+HYemgWOC/ewYkOjJo/W75sACMRs/Wq2ooCpfY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Miroslav Benes , YueHaibing , Jessica Yu , Sasha Levin Subject: [PATCH 4.19 003/195] kernel/module: Fix memleak in module_add_modinfo_attrs() Date: Mon, 10 Feb 2020 04:31:01 -0800 Message-Id: <20200210122306.091895826@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200210122305.731206734@linuxfoundation.org> References: <20200210122305.731206734@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: YueHaibing [ Upstream commit f6d061d617124abbd55396a3bc37b9bf7d33233c ] In module_add_modinfo_attrs() if sysfs_create_file() fails on the first iteration of the loop (so i = 0), we forget to free the modinfo_attrs. Fixes: bc6f2a757d52 ("kernel/module: Fix mem leak in module_add_modinfo_attrs") Reviewed-by: Miroslav Benes Signed-off-by: YueHaibing Signed-off-by: Jessica Yu Signed-off-by: Sasha Levin --- kernel/module.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kernel/module.c b/kernel/module.c index d3aaec62c1423..70a75a7216abb 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -1729,6 +1729,8 @@ static int module_add_modinfo_attrs(struct module *mod) error_out: if (i > 0) module_remove_modinfo_attrs(mod, --i); + else + kfree(mod->modinfo_attrs); return error; } -- 2.20.1