summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-09-25 21:37:41 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-09-25 21:37:41 +0200
commita38523185b40fd85d2afe5b5fbfb0952f7153e96 (patch)
tree0e93b1fae6f449647cad5b9011442bf33cdc3c5b /include
parent846e8dd47c264e0b359afed28ea88e0acdee6818 (diff)
parent41c9b1be335b5afc3b5fb71c5d16f9d5939cd13f (diff)
downloadlinux-stable-a38523185b40fd85d2afe5b5fbfb0952f7153e96.tar.gz
linux-stable-a38523185b40fd85d2afe5b5fbfb0952f7153e96.tar.bz2
linux-stable-a38523185b40fd85d2afe5b5fbfb0952f7153e96.zip
erge tag 'libnvdimm-fixes-4.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm
Dan writes: "libnvdimm/dax for 4.19-rc6 * (2) fixes for the dax error handling updates that were merged for v4.19-rc1. My mails to Al have been bouncing recently, so I do not have his ack but the uaccess change is of the trivial / obviously correct variety. The address_space_operations fixes a regression. * A filesystem-dax fix to correct the zero page lookup to be compatible with non-x86 (mips and s390) architectures." * tag 'libnvdimm-fixes-4.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm: device-dax: Add missing address_space_operations uaccess: Fix is_source param for check_copy_size() in copy_to_iter_mcsafe() filesystem-dax: Fix use of zero page
Diffstat (limited to 'include')
-rw-r--r--include/linux/uio.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/uio.h b/include/linux/uio.h
index 409c845d4cd3..422b1c01ee0d 100644
--- a/include/linux/uio.h
+++ b/include/linux/uio.h
@@ -172,7 +172,7 @@ size_t copy_from_iter_flushcache(void *addr, size_t bytes, struct iov_iter *i)
static __always_inline __must_check
size_t copy_to_iter_mcsafe(void *addr, size_t bytes, struct iov_iter *i)
{
- if (unlikely(!check_copy_size(addr, bytes, false)))
+ if (unlikely(!check_copy_size(addr, bytes, true)))
return 0;
else
return _copy_to_iter_mcsafe(addr, bytes, i);