Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8664b90b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge fixes from Andrew Morton:
 "21 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (21 commits)
  writeback: fix initial dirty limit
  mm/memory-failure: set PageHWPoison before migrate_pages()
  mm: check __PG_HWPOISON separately from PAGE_FLAGS_CHECK_AT_*
  mm/memory-failure: give up error handling for non-tail-refcounted thp
  mm/memory-failure: fix race in counting num_poisoned_pages
  mm/memory-failure: unlock_page before put_page
  ipc: use private shmem or hugetlbfs inodes for shm segments.
  mm: initialize hotplugged pages as reserved
  ocfs2: fix shift left overflow
  kthread: export kthread functions
  fsnotify: fix oops in fsnotify_clear_marks_by_group_flags()
  lib/iommu-common.c: do not use 0xffffffffffffffffl for computing align_mask
  mm/slub: allow merging when SLAB_DEBUG_FREE is set
  signalfd: fix information leak in signalfd_copyinfo
  signal: fix information leak in copy_siginfo_to_user
  signal: fix information leak in copy_siginfo_from_user32
  ocfs2: fix BUG in ocfs2_downconvert_thread_do_work()
  fs, file table: reinit files_stat.max_files after deferred memory initialisation
  mm, meminit: replace rwsem with completion
  mm, meminit: allow early_pfn_to_nid to be used during runtime
  ...
parents a58997e1 a50fcb51

arch/arm64/kernel/signal32.c

+2 −3
Original line number Diff line number Diff line
@@ -168,7 +168,8 @@ int copy_siginfo_to_user32(compat_siginfo_t __user *to, const siginfo_t *from) 
		 * Other callers might not initialize the si_lsb field,

		 * so check explicitely for the right codes here.

		 */

		if (from->si_code == BUS_MCEERR_AR || from->si_code == BUS_MCEERR_AO)

		if (from->si_signo == SIGBUS &&

		    (from->si_code == BUS_MCEERR_AR || from->si_code == BUS_MCEERR_AO))

			err |= __put_user(from->si_addr_lsb, &to->si_addr_lsb);

#endif

		break;
@@ -201,8 +202,6 @@ int copy_siginfo_to_user32(compat_siginfo_t __user *to, const siginfo_t *from) 


int copy_siginfo_from_user32(siginfo_t *to, compat_siginfo_t __user *from)

{

	memset(to, 0, sizeof *to);



	if (copy_from_user(to, from, __ARCH_SI_PREAMBLE_SIZE) ||

	    copy_from_user(to->_sifields._pad,

			   from->_sifields._pad, SI_PAD_SIZE))

arch/mips/kernel/signal32.c

+0 −2
Original line number Diff line number Diff line
@@ -409,8 +409,6 @@ int copy_siginfo_to_user32(compat_siginfo_t __user *to, const siginfo_t *from) 


int copy_siginfo_from_user32(siginfo_t *to, compat_siginfo_t __user *from)

{

	memset(to, 0, sizeof *to);



	if (copy_from_user(to, from, 3*sizeof(int)) ||

	    copy_from_user(to->_sifields._pad,

			   from->_sifields._pad, SI_PAD_SIZE32))

arch/powerpc/kernel/signal_32.c

+0 −2
Original line number Diff line number Diff line
@@ -966,8 +966,6 @@ int copy_siginfo_to_user32(struct compat_siginfo __user *d, const siginfo_t *s) 


int copy_siginfo_from_user32(siginfo_t *to, struct compat_siginfo __user *from)

{

	memset(to, 0, sizeof *to);



	if (copy_from_user(to, from, 3*sizeof(int)) ||

	    copy_from_user(to->_sifields._pad,

			   from->_sifields._pad, SI_PAD_SIZE32))

arch/tile/kernel/compat_signal.c

+0 −2
Original line number Diff line number Diff line
@@ -113,8 +113,6 @@ int copy_siginfo_from_user32(siginfo_t *to, struct compat_siginfo __user *from) 
	if (!access_ok(VERIFY_READ, from, sizeof(struct compat_siginfo)))

		return -EFAULT;



	memset(to, 0, sizeof(*to));



	err = __get_user(to->si_signo, &from->si_signo);

	err |= __get_user(to->si_errno, &from->si_errno);

	err |= __get_user(to->si_code, &from->si_code);

fs/dcache.c

+3 −10
Original line number Diff line number Diff line
@@ -3442,22 +3442,15 @@ void __init vfs_caches_init_early(void) 
	inode_init_early();

}



void __init vfs_caches_init(unsigned long mempages)

void __init vfs_caches_init(void)

{

	unsigned long reserve;



	/* Base hash sizes on available memory, with a reserve equal to

           150% of current kernel size */



	reserve = min((mempages - nr_free_pages()) * 3/2, mempages - 1);

	mempages -= reserve;



	names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0,

			SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);



	dcache_init();

	inode_init();

	files_init(mempages);

	files_init();

	files_maxfiles_init();

	mnt_init();

	bdev_cache_init();

	chrdev_init();