Linus Torvalds (1): mm: mmap: Fix bug in generic strncpy_from_user Sedat Dilek (8): kbuild: deb-pkg: Try to determine distribution kbuild: deb-pkg: Bump year in debian/copyright file kbuild: deb-pkg: Update git repository URL in debian/copyright file Merge tag 'next-20130227' of git://git.kernel.org/.../next/linux-next into Linux-Next-v20130227 Revert "idr: implement lookup hint" Merge branch 'deb-pkg-fixes' into 3.8.0-next20130227-4-iniza-small Merge branch 'idr-next-fixes' into 3.8.0-next20130227-4-iniza-small Merge branch 'mm-mmap-fixes' into 3.8.0-next20130227-4-iniza-small include/linux/idr.h | 25 +------------------------ lib/idr.c | 38 ++++++++++++++++++++++---------------- mm/mmap.c | 27 +++++++++++++++++++++++++++ scripts/package/builddeb | 19 ++++++++++++++++--- 4 files changed, 66 insertions(+), 43 deletions(-) diff --git a/include/linux/idr.h b/include/linux/idr.h index aed2a0c..7b1c5c6 100644 --- a/include/linux/idr.h +++ b/include/linux/idr.h @@ -37,7 +37,6 @@ struct idr_layer { }; struct idr { - struct idr_layer __rcu *hint; /* the last layer allocated from */ struct idr_layer __rcu *top; struct idr_layer *id_free; int layers; /* only valid w/o concurrent changes */ @@ -72,7 +71,7 @@ struct idr { * This is what we export. */ -void *idr_find_slowpath(struct idr *idp, int id); +void *idr_find(struct idr *idp, int id); int idr_pre_get(struct idr *idp, gfp_t gfp_mask); int idr_get_new_above(struct idr *idp, void *ptr, int starting_id, int *id); void idr_preload(gfp_t gfp_mask); @@ -98,28 +97,6 @@ static inline void idr_preload_end(void) } /** - * idr_find - return pointer for given id - * @idp: idr handle - * @id: lookup key - * - * Return the pointer given the id it has been registered with. A %NULL - * return indicates that @id is not valid or you passed %NULL in - * idr_get_new(). - * - * This function can be called under rcu_read_lock(), given that the leaf - * pointers lifetimes are correctly managed. - */ -static inline void *idr_find(struct idr *idr, int id) -{ - struct idr_layer *hint = rcu_dereference_raw(idr->hint); - - if ((id & ~IDR_MASK) == hint->prefix) - return rcu_dereference_raw(hint->ary[id & IDR_MASK]); - - return idr_find_slowpath(idr, id); -} - -/** * idr_get_new - allocate new idr entry * @idp: idr handle * @ptr: pointer you want associated with the id diff --git a/lib/idr.c b/lib/idr.c index 5c772dc..5cd6029 100644 --- a/lib/idr.c +++ b/lib/idr.c @@ -137,10 +137,8 @@ static void idr_layer_rcu_free(struct rcu_head *head) kmem_cache_free(idr_layer_cache, layer); } -static inline void free_layer(struct idr *idr, struct idr_layer *p) +static inline void free_layer(struct idr_layer *p) { - if (idr->hint == p) - RCU_INIT_POINTER(idr->hint, NULL); call_rcu(&p->rcu_head, idr_layer_rcu_free); } @@ -365,12 +363,8 @@ build_up: * @id and @pa are from a successful allocation from idr_get_empty_slot(). * Install the user pointer @ptr and mark the slot full. */ -static void idr_fill_slot(struct idr *idr, void *ptr, int id, - struct idr_layer **pa) +static void idr_fill_slot(void *ptr, int id, struct idr_layer **pa) { - /* update hint used for lookup, cleared from free_layer() */ - rcu_assign_pointer(idr->hint, pa[0]); - rcu_assign_pointer(pa[0]->ary[id & IDR_MASK], (struct idr_layer *)ptr); pa[0]->count++; idr_mark_full(pa, id); @@ -403,7 +397,7 @@ int idr_get_new_above(struct idr *idp, void *ptr, int starting_id, int *id) if (rv < 0) return rv == -ENOMEM ? -EAGAIN : rv; - idr_fill_slot(idp, ptr, rv, pa); + idr_fill_slot(ptr, rv, pa); *id = rv; return 0; } @@ -510,7 +504,7 @@ int idr_alloc(struct idr *idr, void *ptr, int start, int end, gfp_t gfp_mask) if (unlikely(id > max)) return -ENOSPC; - idr_fill_slot(idr, ptr, id, pa); + idr_fill_slot(ptr, id, pa); return id; } EXPORT_SYMBOL_GPL(idr_alloc); @@ -547,14 +541,14 @@ static void sub_remove(struct idr *idp, int shift, int id) to_free = NULL; while(*paa && ! --((**paa)->count)){ if (to_free) - free_layer(idp, to_free); + free_layer(to_free); to_free = **paa; **paa-- = NULL; } if (!*paa) idp->layers = 0; if (to_free) - free_layer(idp, to_free); + free_layer(to_free); } else idr_remove_warning(id); } @@ -587,7 +581,7 @@ void idr_remove(struct idr *idp, int id) --idp->layers; to_free->count = 0; bitmap_clear(to_free->bitmap, 0, IDR_SIZE); - free_layer(idp, to_free); + free_layer(to_free); } while (idp->id_free_cnt >= MAX_IDR_FREE) { p = get_from_free_list(idp); @@ -628,7 +622,7 @@ void __idr_remove_all(struct idr *idp) /* Get the highest bit that the above add changed from 0->1. */ while (n < fls(id ^ bt_mask)) { if (p) - free_layer(idp, p); + free_layer(p); n += IDR_BITS; p = *--paa; } @@ -661,7 +655,19 @@ void idr_destroy(struct idr *idp) } EXPORT_SYMBOL(idr_destroy); -void *idr_find_slowpath(struct idr *idp, int id) +/** + * idr_find - return pointer for given id + * @idp: idr handle + * @id: lookup key + * + * Return the pointer given the id it has been registered with. A %NULL + * return indicates that @id is not valid or you passed %NULL in + * idr_get_new(). + * + * This function can be called under rcu_read_lock(), given that the leaf + * pointers lifetimes are correctly managed. + */ +void *idr_find(struct idr *idp, int id) { int n; struct idr_layer *p; @@ -685,7 +691,7 @@ void *idr_find_slowpath(struct idr *idp, int id) } return((void *)p); } -EXPORT_SYMBOL(idr_find_slowpath); +EXPORT_SYMBOL(idr_find); /** * idr_for_each - iterate through all stored pointers diff --git a/mm/mmap.c b/mm/mmap.c index a5d7598..49dc7d5 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -2163,9 +2163,28 @@ int expand_downwards(struct vm_area_struct *vma, return error; } +/* + * Note how expand_stack() refuses to expand the stack all the way to + * abut the next virtual mapping, *unless* that mapping itself is also + * a stack mapping. We want to leave room for a guard page, after all + * (the guard page itself is not added here, that is done by the + * actual page faulting logic) + * + * This matches the behavior of the guard page logic (see mm/memory.c: + * check_stack_guard_page()), which only allows the guard page to be + * removed under these circumstances. + */ #ifdef CONFIG_STACK_GROWSUP int expand_stack(struct vm_area_struct *vma, unsigned long address) { + struct vm_area_struct *next; + + address &= PAGE_MASK; + next = vma->vm_next; + if (next && next->vm_start == address + PAGE_SIZE) { + if (!(next->vm_flags & VM_GROWSUP)) + return -ENOMEM; + } return expand_upwards(vma, address); } @@ -2187,6 +2206,14 @@ find_extend_vma(struct mm_struct *mm, unsigned long addr) #else int expand_stack(struct vm_area_struct *vma, unsigned long address) { + struct vm_area_struct *prev; + + address &= PAGE_MASK; + prev = vma->vm_prev; + if (prev && prev->vm_end == address) { + if (!(prev->vm_flags & VM_GROWSDOWN)) + return -ENOMEM; + } return expand_downwards(vma, address); } diff --git a/scripts/package/builddeb b/scripts/package/builddeb index acb8650..7d7c9d8 100644 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -172,9 +172,22 @@ else fi maintainer="$name <$email>" +# Try to determine distribution +if [ -e $(which lsb_release) ]; then + codename=$(lsb_release --codename --short) + if [ "$codename" != "" ]; then + distribution=$codename + else + distribution="UNRELEASED" + echo "WARNING: The distribution could NOT be determined!" + fi +else + echo "HINT: Install lsb_release binary, this helps to identify your distribution!" +fi + # Generate a simple changelog template cat < debian/changelog -linux-upstream ($packageversion) unstable; urgency=low +linux-upstream ($packageversion) $distribution; urgency=low * Custom built Linux kernel. @@ -188,10 +201,10 @@ This is a packacked upstream version of the Linux kernel. The sources may be found at most Linux ftp sites, including: ftp://ftp.kernel.org/pub/linux/kernel -Copyright: 1991 - 2009 Linus Torvalds and others. +Copyright: 1991 - 2013 Linus Torvalds and others. The git repository for mainline kernel development is at: -git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git +git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by