Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nbuf_ensure_contig: fix assert (can be equal if there is zero-length mbuf).

Browse Source 
Found by npftest on sparc64.
This commit is contained in:
rmind 2013-02-19 23:57:37 +00:00
parent 41b0a909cc
commit 3ae8914252
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/net/npf/npf_mbuf.c
View File

@ -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 len)
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;