diff options
| author | Sasha Levin <sasha.levin@oracle.com> | 2014-07-31 23:00:35 -0400 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2014-11-23 10:55:43 +0100 |
| commit | e82fb2401b31b6a2e41d183ffabd42265f02ff56 (patch) | |
| tree | e5432699624098f11beb330f258f8be6c2e1c7e7 | |
| parent | 4d66c1e889252728b8d6417326a86aec9012d652 (diff) | |
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>
| -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 3face248258e..5ca2fa8f423e 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; |