projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'acpica-fixes' and 'acpi-ec-fixes'
[cascardo/linux.git]
/
fs
/
dax.c
diff --git
a/fs/dax.c
b/fs/dax.c
index
761495b
..
e207f8f
100644
(file)
--- a/
fs/dax.c
+++ b/
fs/dax.c
@@
-208,7
+208,12
@@
static ssize_t dax_io(struct inode *inode, struct iov_iter *iter,
dax.addr += first;
size = map_len - first;
}
dax.addr += first;
size = map_len - first;
}
- max = min(pos + size, end);
+ /*
+ * pos + size is one past the last offset for IO,
+ * so pos + size can overflow loff_t at extreme offsets.
+ * Cast to u64 to catch this and get the true minimum.
+ */
+ max = min_t(u64, pos + size, end);
}
if (iov_iter_rw(iter) == WRITE) {
}
if (iov_iter_rw(iter) == WRITE) {