]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
CIFS: Add transform header handling callbacks
authorPavel Shilovsky <pshilov@microsoft.com>
Thu, 17 Nov 2016 23:24:34 +0000 (15:24 -0800)
committerSteve French <smfrench@gmail.com>
Wed, 1 Feb 2017 22:46:36 +0000 (16:46 -0600)
We need to recognize and parse transformed packets in demultiplex
thread to find a corresponsing mid and process it further.

Signed-off-by: Pavel Shilovsky <pshilov@microsoft.com>
fs/cifs/cifsglob.h
fs/cifs/connect.c

index 14196e00f79e12279e9cc65a0ea424c94f77456c..35cf62ba5416300a4b624580ed0042d598e37f4d 100644 (file)
@@ -440,6 +440,9 @@ struct smb_version_operations {
                                 struct smb_rqst *);
        /* free transform request */
        void (*free_transform_rq)(struct smb_rqst *);
+       int (*is_transform_hdr)(void *buf);
+       int (*receive_transform)(struct TCP_Server_Info *,
+                                struct mid_q_entry **);
 };
 
 struct smb_version_values {
index b84febf960e940ec61b642fc9993e753206f02e1..35faa6cb7f82c2a1ee2353d5fbf55eacf3f4249e 100644 (file)
@@ -872,12 +872,19 @@ cifs_demultiplex_thread(void *p)
                        continue;
                server->total_read += length;
 
-               mid_entry = server->ops->find_mid(server, buf);
+               if (server->ops->is_transform_hdr &&
+                   server->ops->receive_transform &&
+                   server->ops->is_transform_hdr(buf)) {
+                       length = server->ops->receive_transform(server,
+                                                               &mid_entry);
+               } else {
+                       mid_entry = server->ops->find_mid(server, buf);
 
-               if (!mid_entry || !mid_entry->receive)
-                       length = standard_receive3(server, mid_entry);
-               else
-                       length = mid_entry->receive(server, mid_entry);
+                       if (!mid_entry || !mid_entry->receive)
+                               length = standard_receive3(server, mid_entry);
+                       else
+                               length = mid_entry->receive(server, mid_entry);
+               }
 
                if (length < 0)
                        continue;