Quoting Cyrill Gorcunov (gorcu...@openvz.org): > To eliminate code duplication lets introduce check_data_rlimit > helper which we will use in brk() and prctl() syscalls. > > v2 (serge.hallyn@): > - need to check against RLIM_INFINITY rather than RLIMIT_DATA > > Signed-off-by: Cyrill Gorcunov <gorcu...@openvz.org> > Cc: Kees Cook <keesc...@chromium.org> > Cc: Tejun Heo <t...@kernel.org> > Cc: Andrew Morton <a...@linux-foundation.org> > Cc: Andrew Vagin <ava...@openvz.org> > Cc: Eric W. Biederman <ebied...@xmission.com> > Cc: H. Peter Anvin <h...@zytor.com> > Cc: Serge Hallyn <serge.hal...@canonical.com>
Acked-by: Serge Hallyn <serge.hal...@canonical.com> > Cc: Pavel Emelyanov <xe...@parallels.com> > Cc: Vasiliy Kulikov <seg...@openwall.com> > Cc: KAMEZAWA Hiroyuki <kamezawa.hir...@jp.fujitsu.com> > Cc: Michael Kerrisk <mtk.manpa...@gmail.com> > Cc: Julien Tinnes <j...@google.com> > --- > include/linux/mm.h | 15 +++++++++++++++ > 1 file changed, 15 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,20 @@ extern struct vm_area_struct *copy_vma(s > bool *need_rmap_locks); > extern void exit_mmap(struct mm_struct *); > > +static inline int check_data_rlimit(unsigned long rlim, > + unsigned long new, > + unsigned long start, > + unsigned long end_data, > + unsigned long start_data) > +{ > + if (rlim < RLIM_INFINITY) { > + if (((new - start) + (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 majord...@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/