[v2,2/2] net/virtio: check return from rte_raw_cksum_mbuf
Checks
Commit Message
rte_raw_cksum_mbuf can fail, so we should check to see if it
has. If so, return with an error.
Fixes: 96cb6711939e ("net/virtio: support Rx checksum offload")
Signed-off-by: Chas Williams <3chas3@gmail.com>
---
drivers/net/virtio/virtio_rxtx.c | 5 +++--
drivers/net/virtio/virtio_rxtx_packed_avx.c | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
Comments
> rte_raw_cksum_mbuf can fail, so we should check to see if it
> has. If so, return with an error.
>
> Fixes: 96cb6711939e ("net/virtio: support Rx checksum offload")
It is an old bug, so it should be backported, right?
Cc: stable@dpdk.org
> Signed-off-by: Chas Williams <3chas3@gmail.com>
> ---
>
> drivers/net/virtio/virtio_rxtx.c | 5 +++--
> drivers/net/virtio/virtio_rxtx_packed_avx.c | 5 +++--
Please use --cc-cmd devtools/get-maintainer.sh
so the maintainers are aware.
On 10/1/20 12:22 PM, Chas Williams wrote:
> rte_raw_cksum_mbuf can fail, so we should check to see if it
> has. If so, return with an error.
>
> Fixes: 96cb6711939e ("net/virtio: support Rx checksum offload")
>
> Signed-off-by: Chas Williams <3chas3@gmail.com>
> ---
> drivers/net/virtio/virtio_rxtx.c | 5 +++--
> drivers/net/virtio/virtio_rxtx_packed_avx.c | 5 +++--
> 2 files changed, 6 insertions(+), 4 deletions(-)
>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Thanks,
Maxime
09/10/2020 09:14, Maxime Coquelin:
>
> On 10/1/20 12:22 PM, Chas Williams wrote:
> > rte_raw_cksum_mbuf can fail, so we should check to see if it
> > has. If so, return with an error.
> >
> > Fixes: 96cb6711939e ("net/virtio: support Rx checksum offload")
> >
> > Signed-off-by: Chas Williams <3chas3@gmail.com>
>
> Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Series applied, thanks
@@ -910,9 +910,10 @@ virtio_rx_offload(struct rte_mbuf *m, struct virtio_net_hdr *hdr)
*/
uint16_t csum = 0, off;
- rte_raw_cksum_mbuf(m, hdr->csum_start,
+ if (rte_raw_cksum_mbuf(m, hdr->csum_start,
rte_pktmbuf_pkt_len(m) - hdr->csum_start,
- &csum);
+ &csum) < 0)
+ return -EINVAL;
if (likely(csum != 0xffff))
csum = ~csum;
off = hdr->csum_offset + hdr->csum_start;
@@ -328,9 +328,10 @@ virtio_vec_rx_offload(struct rte_mbuf *m, struct virtio_net_hdr *hdr)
*/
uint16_t csum = 0, off;
- rte_raw_cksum_mbuf(m, hdr->csum_start,
+ if (rte_raw_cksum_mbuf(m, hdr->csum_start,
rte_pktmbuf_pkt_len(m) - hdr->csum_start,
- &csum);
+ &csum) < 0)
+ return -1;
if (likely(csum != 0xffff))
csum = ~csum;
off = hdr->csum_offset + hdr->csum_start;