Skip to content

Commit

Permalink
iovec: make sure the caller actually wants anything in memcpy_fromiov…
Browse files Browse the repository at this point in the history
…ecend

Based on upstream change 06ebb06d49486676272a3c030bfeef4bd969a8e6

One more instance when the caller requests 0 bytes instead of running
off and dereferencing potentially invalid iovecs.

Signed-off-by: Paul Lawrence <paullawrence@google.com>
Bug: 36279469
Change-Id: Ib8d529e17c07c77357ab70bd6a2d7e305d6b27f0
  • Loading branch information
PaulLawrenceGoogle authored and mdmower committed Apr 6, 2018
1 parent 32b77fb commit cff815e
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions net/core/iovec.c
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,10 @@ int csum_partial_copy_fromiovecend(unsigned char *kdata, struct iovec *iov,
__wsum csum = *csump;
int partial_cnt = 0, err = 0;

/* No data? Done! */
if (len == 0)
return 0;

/* Skip over the finished iovecs */
while (offset >= iov->iov_len) {
offset -= iov->iov_len;
Expand Down

0 comments on commit cff815e

Please sign in to comment.