Quoting Cyrill Gorcunov ([email protected]): > To eliminate code duplication lets introduce may_adjust_brk > helper which we will use in brk() and prctl() syscalls. > > Signed-off-by: Cyrill Gorcunov <[email protected]> > Cc: Kees Cook <[email protected]> > Cc: Tejun Heo <[email protected]> > Cc: Andrew Morton <[email protected]> > Cc: Andrew Vagin <[email protected]> > Cc: Eric W. Biederman <[email protected]> > Cc: H. Peter Anvin <[email protected]> > Cc: Serge Hallyn <[email protected]> > Cc: Pavel Emelyanov <[email protected]> > Cc: Vasiliy Kulikov <[email protected]> > Cc: KAMEZAWA Hiroyuki <[email protected]> > Cc: Michael Kerrisk <[email protected]> > Cc: Julien Tinnes <[email protected]> > --- > include/linux/mm.h | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > Index: linux-2.6.git/include/linux/mm.h > =================================================================== > --- linux-2.6.git.orig/include/linux/mm.h > +++ linux-2.6.git/include/linux/mm.h > @@ -18,6 +18,7 @@ > #include <linux/pfn.h> > #include <linux/bit_spinlock.h> > #include <linux/shrinker.h> > +#include <linux/resource.h> > > struct mempolicy; > struct anon_vma; > @@ -1780,6 +1781,19 @@ extern struct vm_area_struct *copy_vma(s > bool *need_rmap_locks); > extern void exit_mmap(struct mm_struct *); > > +static inline int may_adjust_brk(unsigned long rlim, > + unsigned long new_brk, > + unsigned long start_brk, > + unsigned long end_data, > + unsigned long start_data) > +{ > + if (rlim < RLIMIT_DATA) {
In the code you're replacing, this was RLIM_INFINITY. Did you really mean for this to be RLIMIT_DATA, aka 2? > + if (((new_brk - start_brk) + (end_data - start_data)) > rlim) > + return -ENOSPC; > + } > + return 0; > +} > + > extern int mm_take_all_locks(struct mm_struct *mm); > extern void mm_drop_all_locks(struct mm_struct *mm); > > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
