From patchwork Tue Jun 23 19:55:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 223537 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=-10.0 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,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 0E376C433E2 for ; Tue, 23 Jun 2020 20:14:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D4CCD2137B for ; Tue, 23 Jun 2020 20:14:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592943243; bh=HxgZGib8B7jApfVRJLYV16Iqb0rLo81W0p/C/EOsT08=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=wjB0YBp5IyKJFJRAoHNwhAzED2GU3fzRJ8BG3vroTzkZBzvdWeQvgsLeGF63Raph9 /53WBYMau44vdXpK28/8hs/1DTaYsWnO4BWiDRDWpKfm9JMn+orO4bbSdg32DiawNM gF2T/1m2AFKInqLEDC3z5UsKlMu9CdM5hl+JsYhI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389146AbgFWUOC (ORCPT ); Tue, 23 Jun 2020 16:14:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:56128 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388713AbgFWUNx (ORCPT ); Tue, 23 Jun 2020 16:13:53 -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 4118F20E65; Tue, 23 Jun 2020 20:13:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592943232; bh=HxgZGib8B7jApfVRJLYV16Iqb0rLo81W0p/C/EOsT08=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=inDALAsOuUQXR8DzNlMaLW60AOMtgrQfowJ/RpH05WRRSFGzMWR6T14M3+ZaXwLQd JO3fRdR214pvXWw+GSfzv2GuQwabQz3OkNOVrs6FIMBMSxPl98rbIJTvL0RfpgpZZS 2iyj/J2YcgHgqL9FjQP1AjRkbSuab0t9PNKcBxQQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lee Duncan , Qiushi Wu , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 5.7 312/477] scsi: iscsi: Fix reference count leak in iscsi_boot_create_kobj Date: Tue, 23 Jun 2020 21:55:09 +0200 Message-Id: <20200623195422.285864109@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195407.572062007@linuxfoundation.org> References: <20200623195407.572062007@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: Qiushi Wu [ Upstream commit 0267ffce562c8bbf9b57ebe0e38445ad04972890 ] kobject_init_and_add() takes reference even when it fails. If this function returns an error, kobject_put() must be called to properly clean up the memory associated with the object. Link: https://lore.kernel.org/r/20200528201353.14849-1-wu000273@umn.edu Reviewed-by: Lee Duncan Signed-off-by: Qiushi Wu Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/iscsi_boot_sysfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/scsi/iscsi_boot_sysfs.c b/drivers/scsi/iscsi_boot_sysfs.c index e4857b7280338..a64abe38db2d4 100644 --- a/drivers/scsi/iscsi_boot_sysfs.c +++ b/drivers/scsi/iscsi_boot_sysfs.c @@ -352,7 +352,7 @@ iscsi_boot_create_kobj(struct iscsi_boot_kset *boot_kset, boot_kobj->kobj.kset = boot_kset->kset; if (kobject_init_and_add(&boot_kobj->kobj, &iscsi_boot_ktype, NULL, name, index)) { - kfree(boot_kobj); + kobject_put(&boot_kobj->kobj); return NULL; } boot_kobj->data = data;