[rsbac] small conflict xfs/rsbac 2.4.20
Tony den Haan
rsbac@rsbac.org
Sun Dec 29 22:01:02 2002
hi,
i ran into this mprotect.c.rej when applying rsbac patch on 2.4.20 with
xfs patch:
***************
*** 300,305 ****
goto out;
}
if (vma->vm_end > end) {
error = mprotect_fixup(vma, &prev, nstart, end,
newflags);
goto out;
--- 313,357 ----
goto out;
}
+ #ifdef CONFIG_RSBAC
<<<the rsbac bit to be added.....>>>
+ #endif
if (vma->vm_end > end) {
error = mprotect_fixup(vma, &prev, nstart, end,
newflags);
goto out;
this because xfs patch inserts a test just before "if (vma->vm_end >
end) {"
fixing seems trivial, but made me wonder: why is the rsbac related test,
which seems more expensive, performed *before* the
"if (vma->vm_end > end)" test?
it looks like a less expensive sanity check, might even prevent problems?
tony