svn commit: r245403 - projects/vmxnet/sys/dev/vmware/vmxnet

Bryan Venteicher bryanv at FreeBSD.org
Mon Jan 14 04:30:22 UTC 2013


Author: bryanv
Date: Mon Jan 14 04:30:21 2013
New Revision: 245403
URL: http://svnweb.freebsd.org/changeset/base/245403

Log:
  ASSET we do not over or under run the shared allocation region
  
  Approved by:	grehan (implicit)

Modified:
  projects/vmxnet/sys/dev/vmware/vmxnet/if_vic.c

Modified: projects/vmxnet/sys/dev/vmware/vmxnet/if_vic.c
==============================================================================
--- projects/vmxnet/sys/dev/vmware/vmxnet/if_vic.c	Mon Jan 14 01:15:25 2013	(r245402)
+++ projects/vmxnet/sys/dev/vmware/vmxnet/if_vic.c	Mon Jan 14 04:30:21 2013	(r245403)
@@ -481,7 +481,7 @@ static void
 vic_init_shared_mem(struct vic_softc *sc)
 {
 	uint8_t *kva;
-	u_int offset;
+	size_t offset;
 	int q;
 
 	kva = sc->vic_dma_kva;
@@ -504,6 +504,10 @@ vic_init_shared_mem(struct vic_softc *sc
 	sc->vic_data->vd_tx_offset = offset;
 	sc->vic_data->vd_tx_length = sc->vic_tx_nbufs;
 
+	offset += sc->vic_tx_nbufs * sizeof(struct vic_txdesc);
+	KASSERT(offset == sc->vic_dma_size, ("%s: incorrect offset %zu/%zu",
+	    __func__, offset, sc->vic_dma_size));
+
 	if (sc->vic_flags & VIC_FLAGS_TSO)
 		sc->vic_data->vd_tx_maxfrags = VIC_TSO_MAXSEGS;
 	else


More information about the svn-src-projects mailing list