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

Commit 449cd5d2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull misc fixes from Al Viro:
 "A couple of regression fixes, one for this merge window, one for the
  previous cycle"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  ipc/shm: Fix order of parameters when calling copy_compat_shmid_to_user
  iov_iter: fix page_copy_sane for compound pages
parents d9fde269 58aff0af

ipc/shm.c

+1 −1
Original line number Diff line number Diff line
@@ -1237,7 +1237,7 @@ COMPAT_SYSCALL_DEFINE3(shmctl, int, shmid, int, cmd, void __user *, uptr) 
		err = shmctl_stat(ns, shmid, cmd, &sem64);

		if (err < 0)

			return err;

		if (copy_compat_shmid_to_user(&sem64, uptr, version))

		if (copy_compat_shmid_to_user(uptr, &sem64, version))

			err = -EFAULT;

		return err;

lib/iov_iter.c

+4 −2
Original line number Diff line number Diff line
@@ -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;