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 D9B601C3726; Thu, 6 Jun 2024 14:20:59 +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=1717683659; cv=none; b=uULEZlADfnD1l3PnqytvIS5NdTNNfyCFd1iXFXHBge3A+cfUywZkmzfbIZU9+5IRGo85gaBScUL/nUj7A4GhrvJuBj7EHJtCYpETTYdwZMiTV4d4K1Rps9+ls9ARKNjQuPOo+xwDTRwRXyE8ttI68czPnTU7H1dyUAX+vF1YNa0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717683659; c=relaxed/simple; bh=rp5ygKmXG9B9k21MsdYi9amelNlr9gKuR4kZin/taQM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fv9UiSOjs+TeABgxP4P8wyY7v6N7YyJ5R7crVdMhD3SyBLl6cRdTOWKCGFwGbsz7aCekIhfwlxHBUy9OIRBUodt0iuFnfana5I6Rf5PG+blVf5fFxXpB9jGEwczqvOZsLBrobxMaABbsKqZi6OQcvrOOK6UZImoYBqNMUb8jmHQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=YZC1czSZ; 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="YZC1czSZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B9C78C32781; Thu, 6 Jun 2024 14:20:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1717683659; bh=rp5ygKmXG9B9k21MsdYi9amelNlr9gKuR4kZin/taQM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YZC1czSZel7DoRCQklTlzxLMpdt8+A9Fn+RD4GOxpUy9do6OxvXCiPH3tSK0fY6SL aG+XmSmyojHw4nm/obfQBNVONiQKY66hi8HRpKZmxS2GEnIt/wmE0K4zpFG9jtASIU CEq3C70uP28up8EC9u7AAXAQIXNZdWchESOAlfXU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Heiko Carstens , Alexander Egorenkov , Alexander Gordeev , Sasha Levin Subject: [PATCH 6.6 539/744] s390/ipl: Fix incorrect initialization of len fields in nvme reipl block Date: Thu, 6 Jun 2024 16:03:31 +0200 Message-ID: <20240606131749.743931228@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240606131732.440653204@linuxfoundation.org> References: <20240606131732.440653204@linuxfoundation.org> User-Agent: quilt/0.67 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.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Alexander Egorenkov [ Upstream commit 9c922b73acaf39f867668d9cbe5dc69c23511f84 ] Use correct symbolic constants IPL_BP_NVME_LEN and IPL_BP0_NVME_LEN to initialize nvme reipl block when 'scp_data' sysfs attribute is being updated. This bug had not been detected before because the corresponding fcp and nvme symbolic constants are equal. Fixes: 23a457b8d57d ("s390: nvme reipl") Reviewed-by: Heiko Carstens Signed-off-by: Alexander Egorenkov Signed-off-by: Alexander Gordeev Signed-off-by: Sasha Levin --- arch/s390/kernel/ipl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c index 8d0b95c173129..14365773aac79 100644 --- a/arch/s390/kernel/ipl.c +++ b/arch/s390/kernel/ipl.c @@ -962,8 +962,8 @@ static ssize_t reipl_nvme_scpdata_write(struct file *filp, struct kobject *kobj, scpdata_len += padding; } - reipl_block_nvme->hdr.len = IPL_BP_FCP_LEN + scpdata_len; - reipl_block_nvme->nvme.len = IPL_BP0_FCP_LEN + scpdata_len; + reipl_block_nvme->hdr.len = IPL_BP_NVME_LEN + scpdata_len; + reipl_block_nvme->nvme.len = IPL_BP0_NVME_LEN + scpdata_len; reipl_block_nvme->nvme.scp_data_len = scpdata_len; return count; -- 2.43.0