diff mbox

[dpdk-dev,v2] mbuf: check sanity of data_len and pkt_len as well

Message ID 20171209213918.6311-1-matvejchikov@gmail.com (mailing list archive)
State Accepted, archived
Delegated to: Thomas Monjalon
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Ilya Matveychikov Dec. 9, 2017, 9:39 p.m. UTC 
  Update rte_mbuf_sanity_check() to check sanity of data_len and pkt_len
fields. For segmented packets it is supposed that head's pkt_len field
should be the sum of all segments data_len values.

Signed-off-by: Ilya V. Matveychikov <matvejchikov@gmail.com>
---
 lib/librte_mbuf/rte_mbuf.c | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

Comments

Olivier Matz Dec. 14, 2017, 8:50 a.m. UTC | #1 
On Sun, Dec 10, 2017 at 12:39:18AM +0300, Ilya V. Matveychikov wrote:
> Update rte_mbuf_sanity_check() to check sanity of data_len and pkt_len
> fields. For segmented packets it is supposed that head's pkt_len field
> should be the sum of all segments data_len values.
> 
> Signed-off-by: Ilya V. Matveychikov <matvejchikov@gmail.com>

Acked-by: Olivier Matz <olivier.matz@6wind.com>

Thanks
Olivier Matz Dec. 14, 2017, 9:31 a.m. UTC | #2 
On Thu, Dec 14, 2017 at 09:50:25AM +0100, Olivier MATZ wrote:
> On Sun, Dec 10, 2017 at 12:39:18AM +0300, Ilya V. Matveychikov wrote:
> > Update rte_mbuf_sanity_check() to check sanity of data_len and pkt_len
> > fields. For segmented packets it is supposed that head's pkt_len field
> > should be the sum of all segments data_len values.
> > 
> > Signed-off-by: Ilya V. Matveychikov <matvejchikov@gmail.com>
> 
> Acked-by: Olivier Matz <olivier.matz@6wind.com>
> 
> Thanks

Just realized the title does not match ./devtools/check-git-log.sh
constraints. I suggest instead:

  mbuf: check sanity of data and packet lengths
Thomas Monjalon Jan. 11, 2018, 11:23 p.m. UTC | #3 
14/12/2017 10:31, Olivier MATZ:
> On Thu, Dec 14, 2017 at 09:50:25AM +0100, Olivier MATZ wrote:
> > On Sun, Dec 10, 2017 at 12:39:18AM +0300, Ilya V. Matveychikov wrote:
> > > Update rte_mbuf_sanity_check() to check sanity of data_len and pkt_len
> > > fields. For segmented packets it is supposed that head's pkt_len field
> > > should be the sum of all segments data_len values.
> > > 
> > > Signed-off-by: Ilya V. Matveychikov <matvejchikov@gmail.com>
> > 
> > Acked-by: Olivier Matz <olivier.matz@6wind.com>
> > 
> > Thanks
> 
> Just realized the title does not match ./devtools/check-git-log.sh
> constraints. I suggest instead:
> 
>   mbuf: check sanity of data and packet lengths

Applied, thanks
diff mbox

Patch

diff --git a/lib/librte_mbuf/rte_mbuf.c b/lib/librte_mbuf/rte_mbuf.c
index 7543662f7..937fd70ea 100644
--- a/lib/librte_mbuf/rte_mbuf.c
+++ b/lib/librte_mbuf/rte_mbuf.c
@@ -202,8 +202,7 @@  rte_pktmbuf_pool_create(const char *name, unsigned n,
 void
 rte_mbuf_sanity_check(const struct rte_mbuf *m, int is_header)
 {
-	const struct rte_mbuf *m_seg;
-	unsigned int nb_segs;
+	unsigned int nb_segs, pkt_len;
 
 	if (m == NULL)
 		rte_panic("mbuf is NULL\n");
@@ -224,14 +223,22 @@  rte_mbuf_sanity_check(const struct rte_mbuf *m, int is_header)
 	if (is_header == 0)
 		return;
 
+	/* data_len is supposed to be not more than pkt_len */
+	if (m->data_len > m->pkt_len)
+		rte_panic("bad data_len\n");
+
 	nb_segs = m->nb_segs;
-	m_seg = m;
-	while (m_seg && nb_segs != 0) {
-		m_seg = m_seg->next;
-		nb_segs--;
-	}
-	if (nb_segs != 0)
+	pkt_len = m->pkt_len;
+
+	do {
+		nb_segs -= 1;
+		pkt_len -= m->data_len;
+	} while ((m = m->next) != NULL);
+
+	if (nb_segs)
 		rte_panic("bad nb_segs\n");
+	if (pkt_len)
+		rte_panic("bad pkt_len\n");
 }
 
 /* dump a mbuf on console */