nvme-tcp: fix nvme_tcp_term_pdu to match spec

[ Upstream commit aa01c67de5 ]

The FEI field of C2HTermReq/H2CTermReq is 4 bytes but not 4-byte-aligned
in the NVMe/TCP specification (it is located at offset 10 in the PDU).
Split it into two 16-bit integers in struct nvme_tcp_term_pdu
so no padding is inserted. There should also be 10 reserved bytes after.
There are currently no users of this type.

Fixes: fc221d0544 ("nvme-tcp: Add protocol header")
Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Caleb Sander <csander@purestorage.com>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>

This commit is contained in:

Caleb Sander

2023-03-20 09:57:36 -06:00

committed by

Greg Kroah-Hartman

parent 73db80dcdc

commit 3c72445dad

1 changed files with 3 additions and 2 deletions

									
										include/linux/nvme-tcp.h
									
		+3
		-2
	
												View File
												
				@@ -114,8 +114,9 @@ struct nvme_tcp_icresp_pdu {

				struct nvme_tcp_term_pdu {

					struct nvme_tcp_hdr	hdr;

					__le16			fes;

					__le32			fei;

					__u8			rsvd[8];

					__le16			feil;

					__le16			feiu;

					__u8			rsvd[10];

				};

				/**