Patch "Set unicode flag on cifs echo request to avoid Mac error" has been added to the 4.4-stable tree

Patch "Set unicode flag on cifs echo request to avoid Mac error" has been added to the 4.4-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    Set unicode flag on cifs echo request to avoid Mac error

to the 4.4-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     set-unicode-flag-on-cifs-echo-request-to-avoid-mac-error.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From 26c9cb668c7fbf9830516b75d8bee70b699ed449 Mon Sep 17 00:00:00 2001
From: Steve French <smfrench@gmail.com>
Date: Tue, 2 May 2017 13:35:20 -0500
Subject: Set unicode flag on cifs echo request to avoid Mac error

From: Steve French <smfrench@gmail.com>

commit 26c9cb668c7fbf9830516b75d8bee70b699ed449 upstream.

Mac requires the unicode flag to be set for cifs, even for the smb
echo request (which doesn't have strings).

Without this Mac rejects the periodic echo requests (when mounting
with cifs) that we use to check if server is down

Signed-off-by: Steve French <smfrench@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 fs/cifs/cifssmb.c |    3 +++
 1 file changed, 3 insertions(+)

--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
@@ -717,6 +717,9 @@ CIFSSMBEcho(struct TCP_Server_Info *serv
 	if (rc)
 		return rc;
 
+	if (server->capabilities & CAP_UNICODE)
+		smb->hdr.Flags2 |= SMBFLG2_UNICODE;
+
 	/* set up echo request */
 	smb->hdr.Tid = 0xffff;
 	smb->hdr.WordCount = 1;


Patches currently in stable-queue which might be from smfrench@gmail.com are

queue-4.4/cifs-fix-mapping-of-sfm_space-and-sfm_period.patch
queue-4.4/cifs-add-misssing-sfm-mapping-for-doublequote.patch
queue-4.4/cifs-fix-cifs_ioc_get_mnt_info-oops.patch
queue-4.4/smb3-work-around-mount-failure-when-using-smb3-dialect-to-macs.patch
queue-4.4/set-unicode-flag-on-cifs-echo-request-to-avoid-mac-error.patch