diff options
author | Sasha Levin <sasha.levin@oracle.com> | 2014-07-31 23:00:35 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-08-02 18:25:21 -0400 |
commit | 06ebb06d49486676272a3c030bfeef4bd969a8e6 (patch) | |
tree | d4be5a1524d4c01f5d7cbeeee33047374f1190ea /lib | |
parent | fcdfe3a7fa4cb74391d42b6a26dc07c20dab1d82 (diff) |
iovec: make sure the caller actually wants anything in memcpy_fromiovecend
Check for cases when the caller requests 0 bytes instead of running off
and dereferencing potentially invalid iovecs.
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/iovec.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/iovec.c b/lib/iovec.c index 7a7c2da4cddf..df3abd1eaa4a 100644 --- a/lib/iovec.c +++ b/lib/iovec.c | |||
@@ -85,6 +85,10 @@ EXPORT_SYMBOL(memcpy_toiovecend); | |||
85 | int memcpy_fromiovecend(unsigned char *kdata, const struct iovec *iov, | 85 | int memcpy_fromiovecend(unsigned char *kdata, const struct iovec *iov, |
86 | int offset, int len) | 86 | int offset, int len) |
87 | { | 87 | { |
88 | /* No data? Done! */ | ||
89 | if (len == 0) | ||
90 | return 0; | ||
91 | |||
88 | /* Skip over the finished iovecs */ | 92 | /* Skip over the finished iovecs */ |
89 | while (offset >= iov->iov_len) { | 93 | while (offset >= iov->iov_len) { |
90 | offset -= iov->iov_len; | 94 | offset -= iov->iov_len; |