diff options
| author | Sasha Levin <sasha.levin@oracle.com> | 2014-07-31 23:00:35 -0400 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2014-09-13 23:41:49 +0100 |
| commit | 12ef6094ca7ab9eb443abdc88b1ddfd3c8fae15c (patch) | |
| tree | 5bf96ad87a7ae0bb433cf445d37ae69f8d43d3c5 /net/core/iovec.c | |
| parent | a57d246b8543731ba3217c06d804f83c79f5583d (diff) | |
| download | kernel_samsung_smdk4412-12ef6094ca7ab9eb443abdc88b1ddfd3c8fae15c.zip kernel_samsung_smdk4412-12ef6094ca7ab9eb443abdc88b1ddfd3c8fae15c.tar.gz kernel_samsung_smdk4412-12ef6094ca7ab9eb443abdc88b1ddfd3c8fae15c.tar.bz2 | |
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: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'net/core/iovec.c')
| -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 fcf9ee7..66e3f1f 100644 --- a/net/core/iovec.c +++ b/net/core/iovec.c @@ -157,6 +157,10 @@ EXPORT_SYMBOL(memcpy_fromiovec); 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; |