svn commit: r280424 - stable/10/sys/x86/iommu

[Konstantin Belousov]

Author: kib
Date: Tue Mar 24 08:18:24 2015
New Revision: 280424
URL: https://svnweb.freebsd.org/changeset/base/280424

Log:
  MFC r280195:
  When inserting new entry into the address map, ensure that not only
  next entry does not intersect with the tail of the new entry, but also
  that previous entry is also before new entry start.

Modified:
  stable/10/sys/x86/iommu/intel_gas.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/x86/iommu/intel_gas.c
==============================================================================
--- stable/10/sys/x86/iommu/intel_gas.c	Tue Mar 24 08:06:45 2015	(r280423)
+++ stable/10/sys/x86/iommu/intel_gas.c	Tue Mar 24 08:18:24 2015	(r280424)
@@ -366,7 +366,8 @@ dmar_gas_match_insert(struct dmar_gas_ma
 
 	next = RB_NEXT(dmar_gas_entries_tree, &a->ctx->rb_root, prev);
 	KASSERT(next->start >= a->entry->end &&
-	    next->start - a->entry->start >= a->size,
+	    next->start - a->entry->start >= a->size &&
+	    prev->end <= a->entry->end,
 	    ("dmar_gas_match_insert hole failed %p prev (%jx, %jx) "
 	    "free_after %jx next (%jx, %jx) entry (%jx, %jx)", a->ctx,
 	    (uintmax_t)prev->start, (uintmax_t)prev->end,