diff options
| author | Sasha Levin <sasha.levin@oracle.com> | 2014-07-31 23:00:35 -0400 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2014-08-19 17:15:01 +0200 |
| commit | cb3770c1f6b13463dcb48802d2cc99591651fa63 (patch) | |
| tree | 612feea91bd5cce25864461efd13166cd3b04b21 | |
| parent | 4b29e9c0a64a0ce0256505315cc3f5819ddbec64 (diff) | |
| download | lwn-cb3770c1f6b13463dcb48802d2cc99591651fa63.tar.gz lwn-cb3770c1f6b13463dcb48802d2cc99591651fa63.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: Jiri Slaby <jslaby@suse.cz>
| -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 dcf0bd5fbc20..8254497bda65 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; |