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

Commit 2bafc7a2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
  CIFS: Fix wrong length in cifs_iovec_read
parents 57a6fa9a 2cebaa58

fs/cifs/file.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1737,7 +1737,7 @@ cifs_iovec_read(struct file *file, const struct iovec *iov, 
			io_parms.pid = pid;

			io_parms.pid = pid;

			io_parms.tcon = pTcon;

			io_parms.tcon = pTcon;

			io_parms.offset = *poffset;

			io_parms.offset = *poffset;

			io_parms.length = len;

			io_parms.length = cur_len;

			rc = CIFSSMBRead(xid, &io_parms, &bytes_read,

			rc = CIFSSMBRead(xid, &io_parms, &bytes_read,

					 &read_data, &buf_type);

					 &read_data, &buf_type);

			pSMBr = (struct smb_com_read_rsp *)read_data;

			pSMBr = (struct smb_com_read_rsp *)read_data;