net/ncsi: Ensure 32-bit boundary for data cksum
Subsystems (3)
PATCH v2 1/1 net/ncsi: Ensure 32-bit boundary for data cksum
The NCSI spec indicates that if the data does not end on a 32 bit boundary, one to three padding bytes equal to 0x00 shall be present to align the checksum field to a 32-bit boundary.
Signed-off-by Terry S. Duncan <[email protected]>
--- net/ncsi/ncsi-cmd.c | 2 +- net/ncsi/ncsi-rsp.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-)
net/ncsi/ncsi-cmd.c +1 -1
@@ -54,7 +54,7 @@ static void ncsi_cmd_build_header(struct ncsi_pkt_hdr *h, checksum =ncsi_calculate_checksum ((unsigned char *)h,sizeof (*h) + nca->payload); pchecksum = (__be32 *)((void *)h +sizeof (struct ncsi_pkt_hdr ) + - nca->payload); +ALIGN (nca->payload,4 )); *pchecksum =htonl (checksum); }
net/ncsi/ncsi-rsp.c +6 -3
@@ -47,7 +47,8 @@ static int ncsi_validate_rsp_pkt(struct ncsi_request *nr,if (ntohs (h->code) !=NCSI_PKT_RSP_C_COMPLETED ||ntohs (h->reason) !=NCSI_PKT_RSP_R_NO_ERROR ) {netdev_dbg (nr->ndp->ndev.dev, -"NCSI: non zero response/reason code\n" ); +"NCSI: non zero response/reason code %04xh, %04xh\n" , +ntohs (h->code),ntohs (h->reason));return -EPERM ; }
@@ -55,7 +56,7 @@ static int ncsi_validate_rsp_pkt(struct ncsi_request *nr,* sender doesn't support checksum according to NCSI * specification. */ - pchecksum = (__be32 *)((void *)(h +1 ) + payload -4 ); + pchecksum = (__be32 *)((void *)(h +1 ) +ALIGN (payload,4 ) -4 );if (ntohl (*pchecksum) ==0 )return 0 ;
@@ -63,7 +64,9 @@ static int ncsi_validate_rsp_pkt(struct ncsi_request *nr, sizeof(*h) + payload - 4);if (*pchecksum !=htonl (checksum)) { -netdev_dbg (nr->ndp->ndev.dev,"NCSI: checksum mismatched\n" ); +netdev_dbg (nr->ndp->ndev.dev, +"NCSI: checksum mismatched; recd: %08x calc: %08x\n" , + *pchecksum,htonl (checksum));return -EINVAL ; }
Signature · 1 line
2.17.1
From: "Terry S. Duncan" <[email protected]>
Date: Mon, 19 Aug 2019 17:24:02 -0700
Quoted 5 lines
The NCSI spec indicates that if the data does not end on a 32 bit boundary, one to three padding bytes equal to
0x00shall be present to align the checksum field to a 32-bit boundary.Signed-off-by Terry S. Duncan <[email protected]>
Applied.