Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
This commit is contained in:
@@ -219,7 +219,8 @@ config FRAME_WARN
|
||||
range 0 8192
|
||||
default 0 if KASAN
|
||||
default 2048 if GCC_PLUGIN_LATENT_ENTROPY
|
||||
default 1024 if !64BIT
|
||||
default 1280 if (!64BIT && PARISC)
|
||||
default 1024 if (!64BIT && !PARISC)
|
||||
default 2048 if 64BIT
|
||||
help
|
||||
Tell gcc to warn at build time for stack frames larger than this.
|
||||
|
@@ -687,8 +687,10 @@ EXPORT_SYMBOL(_copy_from_iter_full_nocache);
|
||||
|
||||
static inline bool page_copy_sane(struct page *page, size_t offset, size_t n)
|
||||
{
|
||||
size_t v = n + offset;
|
||||
if (likely(n <= v && v <= (PAGE_SIZE << compound_order(page))))
|
||||
struct page *head = compound_head(page);
|
||||
size_t v = n + offset + page_address(page) - page_address(head);
|
||||
|
||||
if (likely(n <= v && v <= (PAGE_SIZE << compound_order(head))))
|
||||
return true;
|
||||
WARN_ON(1);
|
||||
return false;
|
||||
|
@@ -735,9 +735,9 @@ EXPORT_SYMBOL_GPL(rhashtable_walk_exit);
|
||||
* rhashtable_walk_start - Start a hash table walk
|
||||
* @iter: Hash table iterator
|
||||
*
|
||||
* Start a hash table walk. Note that we take the RCU lock in all
|
||||
* cases including when we return an error. So you must always call
|
||||
* rhashtable_walk_stop to clean up.
|
||||
* Start a hash table walk at the current iterator position. Note that we take
|
||||
* the RCU lock in all cases including when we return an error. So you must
|
||||
* always call rhashtable_walk_stop to clean up.
|
||||
*
|
||||
* Returns zero if successful.
|
||||
*
|
||||
@@ -846,7 +846,8 @@ EXPORT_SYMBOL_GPL(rhashtable_walk_next);
|
||||
* rhashtable_walk_stop - Finish a hash table walk
|
||||
* @iter: Hash table iterator
|
||||
*
|
||||
* Finish a hash table walk.
|
||||
* Finish a hash table walk. Does not reset the iterator to the start of the
|
||||
* hash table.
|
||||
*/
|
||||
void rhashtable_walk_stop(struct rhashtable_iter *iter)
|
||||
__releases(RCU)
|
||||
|
Verwijs in nieuw issue
Block a user