From: Kumar Thangavel <kumarthangavel.hcl@gmail.com> To: Samuel Mendoza-Jonas <sam@mendozajonas.com>, "David S. Miller" <davem@davemloft.net>, Jakub Kicinski <kuba@kernel.org> Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, openbmc@lists.ozlabs.org, linux-aspeed@lists.ozlabs.org, patrickw3@fb.com, Amithash Prasad <amithash@fb.com>, velumanit@hcl.com Subject: [PATCH] net: ncsi: Adding padding bytes in the payload Date: Tue, 12 Oct 2021 11:52:40 +0530 [thread overview] Message-ID: <20211012062240.GA5761@gmail.com> (raw) Update NC-SI command handler (both standard and OEM) to take into account of payload paddings in allocating skb (in case of payload size is not 32-bit aligned). The checksum field follows payload field, without taking payload padding into account can cause checksum being truncated, leading to dropped packets. Signed-off-by: Kumar Thangavel <thangavel.k@hcl.com> --- net/ncsi/ncsi-cmd.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/net/ncsi/ncsi-cmd.c b/net/ncsi/ncsi-cmd.c index ba9ae482141b..4625fc935603 100644 --- a/net/ncsi/ncsi-cmd.c +++ b/net/ncsi/ncsi-cmd.c @@ -214,11 +214,19 @@ static int ncsi_cmd_handler_oem(struct sk_buff *skb, struct ncsi_cmd_oem_pkt *cmd; unsigned int len; + /* NC-SI spec requires payload to be padded with 0 + * to 32-bit boundary before the checksum field. + * Ensure the padding bytes are accounted for in + * skb allocation + */ + + unsigned short payload = ALIGN(nca->payload, 4); + len = sizeof(struct ncsi_cmd_pkt_hdr) + 4; - if (nca->payload < 26) + if (payload < 26) len += 26; else - len += nca->payload; + len += payload; cmd = skb_put_zero(skb, len); memcpy(&cmd->mfr_id, nca->data, nca->payload); @@ -272,6 +280,7 @@ static struct ncsi_request *ncsi_alloc_command(struct ncsi_cmd_arg *nca) struct net_device *dev = nd->dev; int hlen = LL_RESERVED_SPACE(dev); int tlen = dev->needed_tailroom; + int payload; int len = hlen + tlen; struct sk_buff *skb; struct ncsi_request *nr; @@ -281,14 +290,18 @@ static struct ncsi_request *ncsi_alloc_command(struct ncsi_cmd_arg *nca) return NULL; /* NCSI command packet has 16-bytes header, payload, 4 bytes checksum. + * Payload needs padding so that the checksum field follwoing payload is + * aligned to 32bit boundary. * The packet needs padding if its payload is less than 26 bytes to * meet 64 bytes minimal ethernet frame length. */ len += sizeof(struct ncsi_cmd_pkt_hdr) + 4; - if (nca->payload < 26) + + payload = ALIGN(nca->payload, 4); + if (payload < 26) len += 26; else - len += nca->payload; + len += payload; /* Allocate skb */ skb = alloc_skb(len, GFP_ATOMIC); -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Kumar Thangavel <kumarthangavel.hcl@gmail.com> To: Samuel Mendoza-Jonas <sam@mendozajonas.com>, "David S. Miller" <davem@davemloft.net>, Jakub Kicinski <kuba@kernel.org> Cc: linux-aspeed@lists.ozlabs.org, netdev@vger.kernel.org, openbmc@lists.ozlabs.org, Amithash Prasad <amithash@fb.com>, linux-kernel@vger.kernel.org, velumanit@hcl.com, patrickw3@fb.com Subject: [PATCH] net: ncsi: Adding padding bytes in the payload Date: Tue, 12 Oct 2021 11:52:40 +0530 [thread overview] Message-ID: <20211012062240.GA5761@gmail.com> (raw) Update NC-SI command handler (both standard and OEM) to take into account of payload paddings in allocating skb (in case of payload size is not 32-bit aligned). The checksum field follows payload field, without taking payload padding into account can cause checksum being truncated, leading to dropped packets. Signed-off-by: Kumar Thangavel <thangavel.k@hcl.com> --- net/ncsi/ncsi-cmd.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/net/ncsi/ncsi-cmd.c b/net/ncsi/ncsi-cmd.c index ba9ae482141b..4625fc935603 100644 --- a/net/ncsi/ncsi-cmd.c +++ b/net/ncsi/ncsi-cmd.c @@ -214,11 +214,19 @@ static int ncsi_cmd_handler_oem(struct sk_buff *skb, struct ncsi_cmd_oem_pkt *cmd; unsigned int len; + /* NC-SI spec requires payload to be padded with 0 + * to 32-bit boundary before the checksum field. + * Ensure the padding bytes are accounted for in + * skb allocation + */ + + unsigned short payload = ALIGN(nca->payload, 4); + len = sizeof(struct ncsi_cmd_pkt_hdr) + 4; - if (nca->payload < 26) + if (payload < 26) len += 26; else - len += nca->payload; + len += payload; cmd = skb_put_zero(skb, len); memcpy(&cmd->mfr_id, nca->data, nca->payload); @@ -272,6 +280,7 @@ static struct ncsi_request *ncsi_alloc_command(struct ncsi_cmd_arg *nca) struct net_device *dev = nd->dev; int hlen = LL_RESERVED_SPACE(dev); int tlen = dev->needed_tailroom; + int payload; int len = hlen + tlen; struct sk_buff *skb; struct ncsi_request *nr; @@ -281,14 +290,18 @@ static struct ncsi_request *ncsi_alloc_command(struct ncsi_cmd_arg *nca) return NULL; /* NCSI command packet has 16-bytes header, payload, 4 bytes checksum. + * Payload needs padding so that the checksum field follwoing payload is + * aligned to 32bit boundary. * The packet needs padding if its payload is less than 26 bytes to * meet 64 bytes minimal ethernet frame length. */ len += sizeof(struct ncsi_cmd_pkt_hdr) + 4; - if (nca->payload < 26) + + payload = ALIGN(nca->payload, 4); + if (payload < 26) len += 26; else - len += nca->payload; + len += payload; /* Allocate skb */ skb = alloc_skb(len, GFP_ATOMIC); -- 2.17.1
next reply other threads:[~2021-10-12 6:22 UTC|newest] Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-10-12 6:22 Kumar Thangavel [this message] 2021-10-12 6:22 ` [PATCH] net: ncsi: Adding padding bytes in the payload Kumar Thangavel 2021-10-12 8:02 ` Paul Menzel 2021-10-12 8:02 ` Paul Menzel 2021-10-12 22:44 ` Joel Stanley 2021-10-12 22:44 ` Joel Stanley 2021-10-13 2:46 ` Samuel Mendoza-Jonas 2021-10-13 2:46 ` Samuel Mendoza-Jonas 2021-10-13 13:05 ` Kumar Thangavel
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20211012062240.GA5761@gmail.com \ --to=kumarthangavel.hcl@gmail.com \ --cc=amithash@fb.com \ --cc=davem@davemloft.net \ --cc=kuba@kernel.org \ --cc=linux-aspeed@lists.ozlabs.org \ --cc=linux-kernel@vger.kernel.org \ --cc=netdev@vger.kernel.org \ --cc=openbmc@lists.ozlabs.org \ --cc=patrickw3@fb.com \ --cc=sam@mendozajonas.com \ --cc=velumanit@hcl.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.