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

Commit 1d07b6cb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull copy*_iter fix from Al Viro.

[ Al used entirely the wrong return value. Oopsie. ]

* 'fix-uio' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  fix brown paperbag bug in inlined copy_..._iter()
parents a91ab911 c43aeb19

include/linux/uio.h

+4 −4
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ static __always_inline __must_check 
size_t copy_to_iter(const void *addr, size_t bytes, struct iov_iter *i)

{

	if (unlikely(!check_copy_size(addr, bytes, true)))

		return bytes;

		return 0;

	else

		return _copy_to_iter(addr, bytes, i);

}
@@ -112,7 +112,7 @@ static __always_inline __must_check 
size_t copy_from_iter(void *addr, size_t bytes, struct iov_iter *i)

{

	if (unlikely(!check_copy_size(addr, bytes, false)))

		return bytes;

		return 0;

	else

		return _copy_from_iter(addr, bytes, i);

}
@@ -130,7 +130,7 @@ static __always_inline __must_check 
size_t copy_from_iter_nocache(void *addr, size_t bytes, struct iov_iter *i)

{

	if (unlikely(!check_copy_size(addr, bytes, false)))

		return bytes;

		return 0;

	else

		return _copy_from_iter_nocache(addr, bytes, i);

}
@@ -160,7 +160,7 @@ static __always_inline __must_check 
size_t copy_from_iter_flushcache(void *addr, size_t bytes, struct iov_iter *i)

{

	if (unlikely(!check_copy_size(addr, bytes, false)))

		return bytes;

		return 0;

	else

		return _copy_from_iter_flushcache(addr, bytes, i);

}