Module Name: src
Committed By: rmind
Date: Tue Feb 19 23:57:38 UTC 2013
Modified Files:
src/sys/net/npf: npf_mbuf.c
Log Message:
nbuf_ensure_contig: fix assert (can be equal if there is zero-length mbuf).
Found by npftest on sparc64.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/net/npf/npf_mbuf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/npf/npf_mbuf.c
diff -u src/sys/net/npf/npf_mbuf.c:1.10 src/sys/net/npf/npf_mbuf.c:1.11
--- src/sys/net/npf/npf_mbuf.c:1.10 Sun Jan 20 18:45:56 2013
+++ src/sys/net/npf/npf_mbuf.c Tue Feb 19 23:57:37 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_mbuf.c,v 1.10 2013/01/20 18:45:56 rmind Exp $ */
+/* $NetBSD: npf_mbuf.c,v 1.11 2013/02/19 23:57:37 rmind Exp $ */
/*-
* Copyright (c) 2009-2012 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf_mbuf.c,v 1.10 2013/01/20 18:45:56 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_mbuf.c,v 1.11 2013/02/19 23:57:37 rmind Exp $");
#include <sys/param.h>
#include <sys/mbuf.h>
@@ -163,7 +163,7 @@ nbuf_ensure_contig(nbuf_t *nbuf, size_t
const struct mbuf * const n = nbuf->nb_mbuf;
const size_t off = (uintptr_t)nbuf->nb_nptr - mtod(n, uintptr_t);
- KASSERT(off < n->m_len);
+ KASSERT(off <= n->m_len);
if (__predict_false(n->m_len < (off + len))) {
struct mbuf *m = nbuf->nb_mbuf0;
