From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 503351A0711; Wed, 23 Apr 2025 14:46:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745419596; cv=none; b=LT7eNiGRh8Ewmv3dOGPWKiro5nrWhJukfjKjVwSTKmeO7GnMJto4koDj1qAvkpT2Tv25CfwgipX1wzuwMvnSB0nMir9h8RypSzzQYjzvGHAspzaYAVYGSW/AjWS4UdW5kOT5My859rWGb8ZoaXPAKukzD+2UCz+okWG3Zi9hX6g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745419596; c=relaxed/simple; bh=sdbgRCrfAWavg5Acj0RP2PflrlFz3uVbJs3vNTS2F9c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=n/Dt2QRxrCT948Q/LHmCagqjAGbbSDaCfNxK9Xr/41BtOYO2a2G1SAPPT8NTrKrjtH7ZWL/C1vuvXZBB/bnS7IgpD7Nn1FC+L1VP8ohZ0ESJ4CcELU+QMlYBS7zS60IK9sas2tXPpqnM4t2FoeUfTk7jikpxbwjNaiv3l6up59I= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Jc+YjS70; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Jc+YjS70" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D6A1EC4CEE2; Wed, 23 Apr 2025 14:46:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1745419596; bh=sdbgRCrfAWavg5Acj0RP2PflrlFz3uVbJs3vNTS2F9c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Jc+YjS70Ek3jdCctj1RpyL0omV/OY3AtxJbtmoKaHj7POOYCYDeJHXgHl6EvbcOhm AMqlQNaJIkPIVNwx4SWV3wSb79X489ObnfXV53B+vaGU0bQkEjmPqTKdrlOlX1jBoi /2lNCAcCanuouEvvgnWqGOFdcYbwXhIs8K8SZ9rY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Miaoqian Lin , Mike Christie , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 6.12 006/223] scsi: iscsi: Fix missing scsi_host_put() in error path Date: Wed, 23 Apr 2025 16:41:18 +0200 Message-ID: <20250423142617.379747114@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250423142617.120834124@linuxfoundation.org> References: <20250423142617.120834124@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Miaoqian Lin [ Upstream commit 72eea84a1092b50a10eeecfeba4b28ac9f1312ab ] Add goto to ensure scsi_host_put() is called in all error paths of iscsi_set_host_param() function. This fixes a potential memory leak when strlen() check fails. Fixes: ce51c8170084 ("scsi: iscsi: Add strlen() check in iscsi_if_set{_host}_param()") Signed-off-by: Miaoqian Lin Link: https://lore.kernel.org/r/20250318094344.91776-1-linmq006@gmail.com Reviewed-by: Mike Christie Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/scsi_transport_iscsi.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c index 9b47f91c5b972..8274fe0ec7146 100644 --- a/drivers/scsi/scsi_transport_iscsi.c +++ b/drivers/scsi/scsi_transport_iscsi.c @@ -3209,11 +3209,14 @@ iscsi_set_host_param(struct iscsi_transport *transport, } /* see similar check in iscsi_if_set_param() */ - if (strlen(data) > ev->u.set_host_param.len) - return -EINVAL; + if (strlen(data) > ev->u.set_host_param.len) { + err = -EINVAL; + goto out; + } err = transport->set_host_param(shost, ev->u.set_host_param.param, data, ev->u.set_host_param.len); +out: scsi_host_put(shost); return err; } -- 2.39.5