diff options
| author | Sasha Levin <sasha.levin@oracle.com> | 2014-07-31 23:00:35 -0400 |
|---|---|---|
| committer | Stefan Bader <stefan.bader@canonical.com> | 2014-11-25 15:20:26 +0100 |
| commit | 3683742232dac826806dd805510ec5ead90d8195 (patch) | |
| tree | f35daebececce3b5920eafa594e3ae26db0227e6 | |
| parent | 4e76213ddbc36dfcd55c70722a84afd188527bbb (diff) | |
| download | linux-2.6.32.y-drm33.z-3683742232dac826806dd805510ec5ead90d8195.tar.gz | |
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: Willy Tarreau <w@1wt.eu>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
| -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 3face248258eb9..5ca2fa8f423ec9 100644 --- a/net/core/iovec.c +++ b/net/core/iovec.c @@ -153,6 +153,10 @@ int memcpy_fromiovec(unsigned char *kdata, struct iovec *iov, int len) 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; |