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.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,T_DKIMWL_WL_HIGH,URIBL_BLOCKED,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 7D1DDC28CC5 for ; Sat, 8 Jun 2019 11:42:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 45215214AF for ; Sat, 8 Jun 2019 11:42:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559994152; bh=EkM2IxcFl4jf8hTxdFG9OcyBo5zAazPHULjwbj7FpBc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=YD6xcbIoRQbPu/rL9yRTSuNhVL5oriHJh4klpjXNndqJo8OIcuRrY0xwQaovysCZL Ki6QLChWmYS6ligtFZC19lCiGjZICfUNYNlBWQxsgfvjVxR+E6+uRppz2vrI7X/X3x XzurnA7Wv0tKujD5JAOt9ZS90IKLqUwy3wvrLc9Y= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728487AbfFHLmb (ORCPT ); Sat, 8 Jun 2019 07:42:31 -0400 Received: from mail.kernel.org ([198.145.29.99]:59752 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728470AbfFHLm3 (ORCPT ); Sat, 8 Jun 2019 07:42:29 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C57042166E; Sat, 8 Jun 2019 11:42:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559994148; bh=EkM2IxcFl4jf8hTxdFG9OcyBo5zAazPHULjwbj7FpBc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yeEWeJSa2frBPsxTHomabRblxBpzKtEfX/jMPgm/yZfvuqniI2lSKgQK976dhTAs4 fHAxdkkQuPbFY8HNQ1EczhN0FjTy5KlDKoHm1/44LOACOi79JP/X+9QT9gnOYfeJcz DNdqCVyVxN81iJnEBbBNbb4GeXzb0Npia01UmO4E= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "Tobin C. Harding" , Greg Kroah-Hartman , Joseph Qi , Mark Fasheh , Joel Becker , Junxiao Bi , Changwei Ge , Gang He , Jun Piao , Andrew Morton , Linus Torvalds , Sasha Levin Subject: [PATCH AUTOSEL 5.1 70/70] ocfs2: fix error path kobject memory leak Date: Sat, 8 Jun 2019 07:39:49 -0400 Message-Id: <20190608113950.8033-70-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190608113950.8033-1-sashal@kernel.org> References: <20190608113950.8033-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "Tobin C. Harding" [ Upstream commit b9fba67b3806e21b98bd5a98dc3921a8e9b42d61 ] If a call to kobject_init_and_add() fails we should call kobject_put() otherwise we leak memory. Add call to kobject_put() in the error path of call to kobject_init_and_add(). Please note, this has the side effect that the release method is called if kobject_init_and_add() fails. Link: http://lkml.kernel.org/r/20190513033458.2824-1-tobin@kernel.org Signed-off-by: Tobin C. Harding Reviewed-by: Greg Kroah-Hartman Reviewed-by: Joseph Qi Cc: Mark Fasheh Cc: Joel Becker Cc: Junxiao Bi Cc: Changwei Ge Cc: Gang He Cc: Jun Piao Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- fs/ocfs2/filecheck.c | 1 + 1 file changed, 1 insertion(+) diff --git a/fs/ocfs2/filecheck.c b/fs/ocfs2/filecheck.c index f65f2b2f594d..1906cc962c4d 100644 --- a/fs/ocfs2/filecheck.c +++ b/fs/ocfs2/filecheck.c @@ -193,6 +193,7 @@ int ocfs2_filecheck_create_sysfs(struct ocfs2_super *osb) ret = kobject_init_and_add(&entry->fs_kobj, &ocfs2_ktype_filecheck, NULL, "filecheck"); if (ret) { + kobject_put(&entry->fs_kobj); kfree(fcheck); return ret; } -- 2.20.1