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 15:25:21 -0700 |
| commit | 06ebb06d49486676272a3c030bfeef4bd969a8e6 (patch) | |
| tree | d4be5a1524d4c01f5d7cbeeee33047374f1190ea /lib/iovec.c | |
| parent | fcdfe3a7fa4cb74391d42b6a26dc07c20dab1d82 (diff) | |
| download | linux-06ebb06d49486676272a3c030bfeef4bd969a8e6.tar.gz linux-06ebb06d49486676272a3c030bfeef4bd969a8e6.tar.bz2 linux-06ebb06d49486676272a3c030bfeef4bd969a8e6.zip | |
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/iovec.c')
| -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); int memcpy_fromiovecend(unsigned char *kdata, const struct iovec *iov, int offset, int len) { + /* No data? Done! */ + if (len == 0) + return 0; + /* Skip over the finished iovecs */ while (offset >= iov->iov_len) { offset -= iov->iov_len; |