| Message ID | 20220317012812.1313196-1-opendmb@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 0f643c88c8d240eba0ea25c2e095a46515ff46e9 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] net: bcmgenet: skip invalid partial checksums | expand |
On 3/16/2022 6:28 PM, Doug Berger wrote: > The RXCHK block will return a partial checksum of 0 if it encounters > a problem while receiving a packet. Since a 1's complement sum can > only produce this result if no bits are set in the received data > stream it is fair to treat it as an invalid partial checksum and > not pass it up the stack. > > Fixes: 810155397890 ("net: bcmgenet: use CHECKSUM_COMPLETE for NETIF_F_RXCSUM") > Signed-off-by: Doug Berger <opendmb@gmail.com> Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Hello: This patch was applied to netdev/net.git (master) by Jakub Kicinski <kuba@kernel.org>: On Wed, 16 Mar 2022 18:28:12 -0700 you wrote: > The RXCHK block will return a partial checksum of 0 if it encounters > a problem while receiving a packet. Since a 1's complement sum can > only produce this result if no bits are set in the received data > stream it is fair to treat it as an invalid partial checksum and > not pass it up the stack. > > Fixes: 810155397890 ("net: bcmgenet: use CHECKSUM_COMPLETE for NETIF_F_RXCSUM") > Signed-off-by: Doug Berger <opendmb@gmail.com> > > [...] Here is the summary with links: - [net] net: bcmgenet: skip invalid partial checksums https://git.kernel.org/netdev/net/c/0f643c88c8d2 You are awesome, thank you!
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c index 87f1056e29ff..2da804f84b48 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c @@ -2287,8 +2287,10 @@ static unsigned int bcmgenet_desc_rx(struct bcmgenet_rx_ring *ring, dma_length_status = status->length_status; if (dev->features & NETIF_F_RXCSUM) { rx_csum = (__force __be16)(status->rx_csum & 0xffff); - skb->csum = (__force __wsum)ntohs(rx_csum); - skb->ip_summed = CHECKSUM_COMPLETE; + if (rx_csum) { + skb->csum = (__force __wsum)ntohs(rx_csum); + skb->ip_summed = CHECKSUM_COMPLETE; + } } /* DMA flags and length are still valid no matter how
The RXCHK block will return a partial checksum of 0 if it encounters a problem while receiving a packet. Since a 1's complement sum can only produce this result if no bits are set in the received data stream it is fair to treat it as an invalid partial checksum and not pass it up the stack. Fixes: 810155397890 ("net: bcmgenet: use CHECKSUM_COMPLETE for NETIF_F_RXCSUM") Signed-off-by: Doug Berger <opendmb@gmail.com> --- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)