Commit a24e2d7d authored Apr 03, 2010 by Steve French

[CIFS] initialize nbytes at the beginning of CIFSSMBWrite()



By doing this we always overwrite nbytes value that is being passed on to
CIFSSMBWrite() and need not rely on the callers to initialize. CIFSSMBWrite2 is
doing this already.

CC: Stable <stable@kernel.org>
Reviewed-by: Shirish Pargaonkar <shirishpargaonkar@gmail.com>
Reviewed-by: Jeff Layton <jlayton@samba.org>
Signed-off-by: Suresh Jayaraman <sjayaraman@suse.de>
Signed-off-by: Steve French <sfrench@us.ibm.com>

parent 810627a0

fs/cifs/cifssmb.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1430,6 +1430,8 @@ CIFSSMBWrite(const int xid, struct cifsTconInfo *tcon,
		__u32 bytes_sent;
		__u16 byte_count;

		*nbytes = 0;

		/* cFYI(1, ("write at %lld %d bytes", offset, count));*/
		if (tcon->ses == NULL)
		return -ECONNABORTED;
		@@ -1512,7 +1514,6 @@ CIFSSMBWrite(const int xid, struct cifsTconInfo *tcon,
		cifs_stats_inc(&tcon->num_writes);
		if (rc) {
		cFYI(1, ("Send error in write = %d", rc));
		*nbytes = 0;
		} else {
		*nbytes = le16_to_cpu(pSMBr->CountHigh);
		nbytes = (nbytes) << 16;

Admin message