Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp974781ybt; Wed, 17 Jun 2020 19:37:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyX//W+WQItNmt7UICDPehKqcxOnnwoFOvuk2us2tI/lKs4/8tNc6EWC/rPVAe6wZfMIwcq X-Received: by 2002:a17:906:344e:: with SMTP id d14mr1952509ejb.53.1592447821452; Wed, 17 Jun 2020 19:37:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592447821; cv=none; d=google.com; s=arc-20160816; b=h8bHgF2HjRT8CUnzj6r6U4xfWP4sA8OUXC7Ed2hgcq6totNPHqueOwYkSXzPyqXVSb NFepte6RoMed4AQ3aDnNVVcQlG5z3wuvOWgtHZeKJNxlvz142riVSv4WrvBQwa0d4sgT rbOLKZRPYbmp7qKlr6loiZIxiYlstXgCK3f1CG2zFJXWvHQK+TwHIbC4skxwH+3I40NY jvV7KjhMNgIO9JzJv1keNGX18xSLpwzc/oWOw72Y8fer1rUUXCtGRdVUc3lz+RlekU2y Y2Vw5NCykclJqFsnONT4NsTGgcWt51rQ+2mvBBGch9IkNL3Qfmgg/YBX6wO9OEHzIo7J lF1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=sXcvp4UUDv1pfW0bYdc8+acZvqpooyfsyW11LX3obCg=; b=fkEzdJc4sgq6ZT/stCGkjdmbu1tyj7B++EOh8Mdx4LnAM0dCsIF3sqrnqvKnzWh2kd dKL5vaoXYimVaxKUEkN/Ncq9YAr+G1SXk61yoTsH+H1OHBAhphGptLxUa4WJ6GY2FULx F3D5J7SrCQHIWelU2h5SE+3jySBfX/Ho7kIHtUL3WTQEGTucrq3aUUghIl60cNGu7B3i Ji2dHDUOUwjTkkKH7zHgn7ppyM5MjV9hKA667XQ2VhqOUvnUvu+7lrM5NtWTvohHJTyE tttNp8qWO2YlMsp9AR9RE+DtBJkYEL0/LQ84NnwZK/hrB1hdTx7b9Zw1bmntAM4DUsgS jF/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=X0NQL1SP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g8si1085506ejo.221.2020.06.17.19.36.39; Wed, 17 Jun 2020 19:37:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=X0NQL1SP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387698AbgFRCdB (ORCPT + 99 others); Wed, 17 Jun 2020 22:33:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:44890 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729420AbgFRBO7 (ORCPT ); Wed, 17 Jun 2020 21:14:59 -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 6B21221D7B; Thu, 18 Jun 2020 01:14:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592442899; bh=tTYjXOD8oHPGv57EVtZqi6gCt2pfErDoIHKj/yUv3Ng=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=X0NQL1SPi9aD1oby8wIzYXDo4SNmIf3oMYAx2wWgq7OIbH/IzB+QGqReckQQhc00w u8zKwOqpszqbpU72lrgRwD4Ae4EpeDAAG46dBGqWsFMrKtO9XxZqPEaQ60Ky2JyhTk redXH+ujnc0atsONUnpj6HbL+PxCYryo9W1nr40c= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Qiushi Wu , Lee Duncan , "Martin K . Petersen" , Sasha Levin , open-iscsi@googlegroups.com, linux-scsi@vger.kernel.org Subject: [PATCH AUTOSEL 5.7 320/388] scsi: iscsi: Fix reference count leak in iscsi_boot_create_kobj Date: Wed, 17 Jun 2020 21:06:57 -0400 Message-Id: <20200618010805.600873-320-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200618010805.600873-1-sashal@kernel.org> References: <20200618010805.600873-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: 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 e4857b728033..a64abe38db2d 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