Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83e442eb authored by Caleb Sander's avatar Caleb Sander Committed by Greg Kroah-Hartman
Browse files

nvme-tcp: fix nvme_tcp_term_pdu to match spec 



[ Upstream commit aa01c67de5926fdb276793180564f172c55fb0d7 ]

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: fc221d05 ("nvme-tcp: Add protocol header")
Reported-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarCaleb Sander <csander@purestorage.com>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent d673ae18

include/linux/nvme-tcp.h

+3 −2
Original line number Diff line number Diff line
@@ -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];

};



/**