diff options
| author | Sasha Levin <sasha.levin@oracle.com> | 2014-07-31 23:00:35 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-08-14 09:24:15 +0800 |
| commit | 9d868b94a6f52a17a2a94b34e544800d741b7852 (patch) | |
| tree | a6866ca3e46189b91d66556fa9d0281912eaf7b0 | |
| parent | c290a4ef1fe38bd8d29573468a189e49dbaa0681 (diff) | |
| download | linux-3.10-9d868b94a6f52a17a2a94b34e544800d741b7852.tar.gz linux-3.10-9d868b94a6f52a17a2a94b34e544800d741b7852.tar.bz2 linux-3.10-9d868b94a6f52a17a2a94b34e544800d741b7852.zip | |
iovec: make sure the caller actually wants anything in memcpy_fromiovecend
[ Upstream commit 06ebb06d49486676272a3c030bfeef4bd969a8e6 ]
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | net/core/iovec.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/core/iovec.c b/net/core/iovec.c index 2145b7150be..1117a26a854 100644 --- a/net/core/iovec.c +++ b/net/core/iovec.c @@ -107,6 +107,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; |