Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38ea6e62 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: talitos - fix bug in sg_copy_end_to_buffer
parents 2851785d 7260042b

drivers/crypto/talitos.c

+5 −1
Original line number Diff line number Diff line
@@ -1183,10 +1183,14 @@ static size_t sg_copy_end_to_buffer(struct scatterlist *sgl, unsigned int nents, 
				/* Copy part of this segment */

				ignore = skip - offset;

				len = miter.length - ignore;

				if (boffset + len > buflen)

					len = buflen - boffset;

				memcpy(buf + boffset, miter.addr + ignore, len);

			} else {

				/* Copy all of this segment */

				/* Copy all of this segment (up to buflen) */

				len = miter.length;

				if (boffset + len > buflen)

					len = buflen - boffset;

				memcpy(buf + boffset, miter.addr, len);

			}

			boffset += len;