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=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 B0E4BC433DF for ; Tue, 23 Jun 2020 20:30:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 80E522070E for ; Tue, 23 Jun 2020 20:30:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592944204; bh=HxgZGib8B7jApfVRJLYV16Iqb0rLo81W0p/C/EOsT08=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=KVqDGSJSUWG4pN1KqnOWsfSJGfbYfhE4MWGAAOAdZ65hyPtPNnM3MwzmQd/2rUGjV DdEpgmClX5++TzQ5nnJq1tYyYwAadRLE+mqV9e30ir+B2EM9ks7CPnKqo3AD5Po+s+ JFfNe6SbD4gf0pZW1j5hJw3vJP8MDM8HEsi7Lb2U= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390819AbgFWUaC (ORCPT ); Tue, 23 Jun 2020 16:30:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:50212 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391104AbgFWUaC (ORCPT ); Tue, 23 Jun 2020 16:30:02 -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 A1835206C3; Tue, 23 Jun 2020 20:30:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592944202; bh=HxgZGib8B7jApfVRJLYV16Iqb0rLo81W0p/C/EOsT08=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xrrs/bqxrrrP4G6eypdvo0XSqIAmcUaO4tZysIOb2qcXLS+/aec/yFNdsOFcZEQ2L EYxFCRA1A+N/Miu+1yEUCRZTeKp6oR00JrFt2SRyGCFXEIi8WJfwfsRplNwXIJOt1n AcqAeI6rFKoDUtiNtM5vUI1ZdF7NiYO0l+YTKs4k= 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.4 213/314] scsi: iscsi: Fix reference count leak in iscsi_boot_create_kobj Date: Tue, 23 Jun 2020 21:56:48 +0200 Message-Id: <20200623195349.078630022@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195338.770401005@linuxfoundation.org> References: <20200623195338.770401005@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: 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; -- 2.25.1