diff mbox series

[v2,2/2] net/virtio: check return from rte_raw_cksum_mbuf

Message ID 20201001102245.326223-2-3chas3@gmail.com (mailing list archive)
State Accepted, archived
Delegated to: Thomas Monjalon
Headers
Series [v2,1/2] net: check that seg is valid before dereference |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK
ci/iol-broadcom-Functional success Functional Testing PASS
ci/iol-intel-Functional success Functional Testing PASS
ci/iol-testing success Testing PASS
ci/travis-robot success Travis build: passed

Commit Message

Chas Williams Oct. 1, 2020, 10:22 a.m. UTC 
  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

Thomas Monjalon Oct. 6, 2020, 9:15 p.m. UTC | #1 
> 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.
Maxime Coquelin Oct. 9, 2020, 7:14 a.m. UTC | #2 
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
Thomas Monjalon Oct. 12, 2020, 9:15 p.m. UTC | #3 
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
diff mbox series

Patch

diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c
index 0ade35215..019187bf9 100644
--- a/drivers/net/virtio/virtio_rxtx.c
+++ b/drivers/net/virtio/virtio_rxtx.c
@@ -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;
diff --git a/drivers/net/virtio/virtio_rxtx_packed_avx.c b/drivers/net/virtio/virtio_rxtx_packed_avx.c
index 6a8214725..67a55abce 100644
--- a/drivers/net/virtio/virtio_rxtx_packed_avx.c
+++ b/drivers/net/virtio/virtio_rxtx_packed_avx.c
@@ -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;