d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nfsd: add KASSERTs to nfsm_trimtrailing() for M_EXTPG mbufs

Browse Source 
Add KASSERTS to nfsm_trimtrailing() to confirm the sanity of
the arguments for the M_EXTPG case.

Suggested by:	kib
Reviewed by:	kib
Differential Revision:	https://reviews.freebsd.org/D28053
This commit is contained in:
Rick Macklem 2021-01-10 13:50:15 -08:00
parent ef757da441
commit 148a227bf8
1 changed files with 6 additions and 0 deletions

6
sys/fs/nfsserver/nfs_nfsdport.c

@ -6581,6 +6581,12 @@ nfsm_trimtrailing(struct nfsrv_descript *nd, struct mbuf *mb, char *bpos,
mb->m_next = NULL; mb->m_next = NULL;
} }
if ((mb->m_flags & M_EXTPG) != 0) { if ((mb->m_flags & M_EXTPG) != 0) {
KASSERT(bextpg >= 0 && bextpg < mb->m_epg_npgs,
("nfsm_trimtrailing: bextpg out of range"));
KASSERT(bpos == (char *)(void *)
PHYS_TO_DMAP(mb->m_epg_pa[bextpg]) + PAGE_SIZE - bextpgsiz,
("nfsm_trimtrailing: bextpgsiz bad!"));
/* First, get rid of any pages after this position. */ /* First, get rid of any pages after this position. */
for (i = mb->m_epg_npgs - 1; i > bextpg; i--) { for (i = mb->m_epg_npgs - 1; i > bextpg; i--) {
pg = PHYS_TO_VM_PAGE(mb->m_epg_pa[i]); pg = PHYS_TO_VM_PAGE(mb->m_epg_pa[i]);