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=-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=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 0CEA0C433E2 for ; Tue, 23 Jun 2020 20:41:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D466320702 for ; Tue, 23 Jun 2020 20:41:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592944882; bh=iUhx2mCEszatdkL0B/6D09sYtm+d5NmvFLb6a1swACw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=EEceXwNdfrcg/ucX4kHrngM/mfLo+53UEjypyT/QgiSmILWB6UiOVQO4KrmPbIbdQ Lsor8vYsDZjfasbn73PQ8c7/zC4+sL8PbeU2cLQM66IIRYRwmsB3pKBuUMhkJ6AQ8h /iRBXC+tPrFx5VywWYySAPXF5rth/650YiiA/znk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392313AbgFWUlV (ORCPT ); Tue, 23 Jun 2020 16:41:21 -0400 Received: from mail.kernel.org ([198.145.29.99]:37520 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2392174AbgFWUlI (ORCPT ); Tue, 23 Jun 2020 16:41:08 -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 9270C20702; Tue, 23 Jun 2020 20:41:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592944869; bh=iUhx2mCEszatdkL0B/6D09sYtm+d5NmvFLb6a1swACw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Q5yaPbwEWtHXQRASNc2bEaVz4Nbkj8eOlclVntApR6AFpSdAQ32VsFudZXrnOaJ4h +KxjxxQR3qxQhzT7jCr0OUvN7x937+Pf4WX6GJziolCF9XrjxC5HlZiHequIFJ0pLN G/0r11V8+rfIBGfzmIWD2ddJrc39smsZxjR3yuHc= 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 4.19 129/206] scsi: iscsi: Fix reference count leak in iscsi_boot_create_kobj Date: Tue, 23 Jun 2020 21:57:37 +0200 Message-Id: <20200623195323.321288415@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195316.864547658@linuxfoundation.org> References: <20200623195316.864547658@linuxfoundation.org> User-Agent: quilt/0.66 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: 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 d453667612f88..15d64f96e623c 100644 --- a/drivers/scsi/iscsi_boot_sysfs.c +++ b/drivers/scsi/iscsi_boot_sysfs.c @@ -360,7 +360,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; -- 2.25.1