From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 96BE63624CC; Sat, 12 Sep 2026 15:46:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789227965; cv=none; b=g4Pn5DaLwXuE2guqBeQBiSg+3fUw21CmsE/g7ZixbMHG1o8XrF/yUE2JX7+PqBpIXJS6ied8Xnz8OZkmnYUWMJq5ugyBeU9puWU/uM0I+0uMZXf5gtNB2KCcukvLDcqtSg/WxyXCCJn+4cbFTXW7s5lJhJINXlGeos/GlFkBKuc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789227965; c=relaxed/simple; bh=ISUlLIaYadNdX+PCk8QrQkoXJm7kUcve2wItK2oQ0zI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GtHaxQIW4EfASPu/k97ZeSwKemRL9B2TbGjw/1aaqnWmU3/n+uz+sUycC7jS7XmQz9cAVhqwDx+auNQyWBdQz1wCY577id9H8pzunAM4JiUubkOpVZCvkswPUO17tT5RuzNbqVLqd00T4QA0SiGgL6ZRTyA72/hxPn+f791qsfc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=GWEYoyFL; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="GWEYoyFL" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A3FDA1F000FF; Sat, 12 Sep 2026 15:46:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789227964; bh=KvTtoeaUtivOiuM8Hez3JeG3Qh1ijKImgisLX6qS4/A=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=GWEYoyFLHsNJFvN5On+WHW6CtbvvjIp++Wmvv78p46tTCt6GQJPylDP3/K2IaEZdY ecgyc8d5YNWGV0Hc1zX04icnudyxLrZkuLDKXhTVK7IOVvw4qPziuM7dWsEzcvXfB0 zqFXcDs3UI0Zihu8+5/V3HsOPy3eVToIJZBFpWUY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Sujal Tuladhar , "Martin K. Petersen (Oracle)" Subject: [PATCH 6.1 0282/1191] scsi: target: iscsi: Reserve a terminator byte for the login payload Date: Sat, 12 Sep 2026 08:50:10 +0200 Message-ID: <20260912065554.560744911@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912065548.086904252@linuxfoundation.org> References: <20260912065548.086904252@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Sujal Tuladhar commit f4825922d2fb371e2b969697d792077f1b62b62c upstream. iscsi_target_check_login_request() rejects a login PDU whose DataSegmentLength exceeds MAX_KEY_VALUE_PAIRS, but the test is '>' and login->req_buf is allocated with exactly MAX_KEY_VALUE_PAIRS bytes. Since iscsit_get_login_rx() receives payload_length + padding bytes, where padding = ((-payload_length) & 3); any payload_length from 8189 to 8192 fills the whole 8192 byte buffer. The write stays in bounds, but no byte is left for a NUL terminator. The buffer is subsequently consumed as a C string. In the CHAP path chap_check_algorithm() calls kstrdup(a_str), and extract_param() calls strstr(in_buf, pattern) followed by strlen_semi(), none of which take a length. convert_null_to_semi() additionally rewrites every embedded NUL to ';', so even a payload made of well formed NUL separated key=value records is left without a terminator. These walk past the end of the object into adjacent slab memory. It is reachable by an unauthenticated initiator against a portal configured for CHAP; when authentication is not required iscsi_login_zero_tsih_s2() rewrites AuthMethod to None and the CHAP path is never entered. Allocate one extra byte. kzalloc() zeroes it and nothing ever writes to it, as every writer copies to offset 0 for at most MAX_KEY_VALUE_PAIRS bytes, so the buffer is always terminated. Fixes: e48354ce078c ("iscsi-target: Add iSCSI fabric support for target v4.1") Assisted-by: Claude Opus5 (custom harness) Cc: stable@vger.kernel.org Signed-off-by: Sujal Tuladhar Signed-off-by: Martin K. Petersen (Oracle) Signed-off-by: Greg Kroah-Hartman --- drivers/target/iscsi/iscsi_target_login.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/target/iscsi/iscsi_target_login.c +++ b/drivers/target/iscsi/iscsi_target_login.c @@ -48,7 +48,7 @@ static struct iscsi_login *iscsi_login_i login->conn = conn; login->first_request = 1; - login->req_buf = kzalloc(MAX_KEY_VALUE_PAIRS, GFP_KERNEL); + login->req_buf = kzalloc(MAX_KEY_VALUE_PAIRS + 1, GFP_KERNEL); if (!login->req_buf) { pr_err("Unable to allocate memory for response buffer.\n"); goto out_login;