From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:35632 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754126AbdEQPzm (ORCPT ); Wed, 17 May 2017 11:55:42 -0400 Subject: Patch "Set unicode flag on cifs echo request to avoid Mac error" has been added to the 3.18-stable tree To: smfrench@gmail.com, gregkh@linuxfoundation.org Cc: , From: Date: Wed, 17 May 2017 17:54:59 +0200 Message-ID: <149503649926237@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: 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 3.18-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-3.18 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From 26c9cb668c7fbf9830516b75d8bee70b699ed449 Mon Sep 17 00:00:00 2001 From: Steve French Date: Tue, 2 May 2017 13:35:20 -0500 Subject: Set unicode flag on cifs echo request to avoid Mac error From: Steve French 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 Signed-off-by: Greg Kroah-Hartman --- fs/cifs/cifssmb.c | 3 +++ 1 file changed, 3 insertions(+) --- a/fs/cifs/cifssmb.c +++ b/fs/cifs/cifssmb.c @@ -715,6 +715,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-3.18/cifs-fix-mapping-of-sfm_space-and-sfm_period.patch queue-3.18/cifs-add-misssing-sfm-mapping-for-doublequote.patch queue-3.18/smb3-work-around-mount-failure-when-using-smb3-dialect-to-macs.patch queue-3.18/set-unicode-flag-on-cifs-echo-request-to-avoid-mac-error.patch