--- fs/cifs/cifssmb.c

+++ fs/cifs/cifssmb.c

@@ -1430,6 +1430,8 @@ CIFSSMBWrite(const int xid, struct cifsT

__u32 bytes_sent;

__u16 byte_count;

+ *nbytes = 0;

+

/* cFYI(1, ("write at %lld %d bytes", offset, count));*/

if (tcon->ses == NULL)

return -ECONNABORTED;

@@ -1512,11 +1514,18 @@ CIFSSMBWrite(const int xid, struct cifsT

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;

*nbytes += le16_to_cpu(pSMBr->Count);

+

+ /*

+ * Mask off high 16 bits when bytes written as returned by the

+ * server is greater than bytes requested by the client. Some

+ * OS/2 servers are known to set incorrect CountHigh values.

+ */

+ if (*nbytes > count)

+ *nbytes &= 0xFFFF;

}

cifs_buf_release(pSMB);

@@ -1605,6 +1614,14 @@ CIFSSMBWrite2(const int xid, struct cifs

*nbytes = le16_to_cpu(pSMBr->CountHigh);

*nbytes = (*nbytes) << 16;

*nbytes += le16_to_cpu(pSMBr->Count);

+

+ /*

+ * Mask off high 16 bits when bytes written as returned by the

+ * server is greater than bytes requested by the client. OS/2

+ * servers are known to set incorrect CountHigh values.

+ */

+ if (*nbytes > count)

+ *nbytes &= 0xFFFF;

}

/* cifs_small_buf_release(pSMB); */ /* Freed earlier now in SendReceive2 */