1 files changed, 44 insertions, 25 deletions

diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
index 4f07f6fbe494..52ca861ed35e 100644
--- a/fs/cifs/cifsglob.h
+++ b/fs/cifs/cifsglob.h
@@ -44,6 +44,7 @@
 #define MAX_TREE_SIZE (2 + MAX_SERVER_SIZE + 1 + MAX_SHARE_SIZE + 1)
 #define MAX_SERVER_SIZE 15
 #define MAX_SHARE_SIZE 80
+#define CIFS_MAX_DOMAINNAME_LEN 256 /* max domain name length */
 #define MAX_USERNAME_SIZE 256   /* reasonable maximum for current servers */
 #define MAX_PASSWORD_SIZE 512   /* max for windows seems to be 256 wide chars */
 
@@ -101,20 +102,14 @@ enum statusEnum {
 };
 
 enum securityEnum {
-        LANMAN = 0,                     /* Legacy LANMAN auth */
+        Unspecified = 0,        /* not specified */
+        LANMAN,                 /* Legacy LANMAN auth */
         NTLM,                   /* Legacy NTLM012 auth with NTLM hash */
         NTLMv2,                 /* Legacy NTLM auth with NTLMv2 hash */
         RawNTLMSSP,             /* NTLMSSP without SPNEGO, NTLMv2 hash */
-/*      NTLMSSP, */ /* can use rawNTLMSSP instead of NTLMSSP via SPNEGO */
         Kerberos,               /* Kerberos via SPNEGO */
 };
 
-enum protocolEnum {
-        TCP = 0,
-        SCTP
-        /* Netbios frames protocol not supported at this time */
-};
-
 struct session_key {
         unsigned int len;
         char *response;
@@ -131,9 +126,11 @@ struct cifs_secmech {
         struct crypto_shash *hmacmd5; /* hmac-md5 hash function */
         struct crypto_shash *md5; /* md5 hash function */
         struct crypto_shash *hmacsha256; /* hmac-sha256 hash function */
+        struct crypto_shash *cmacaes; /* block-cipher based MAC function */
         struct sdesc *sdeschmacmd5;  /* ctxt to generate ntlmv2 hash, CR1 */
         struct sdesc *sdescmd5; /* ctxt to generate cifs/smb signature */
         struct sdesc *sdeschmacsha256;  /* ctxt to generate smb2 signature */
+        struct sdesc *sdesccmacaes;  /* ctxt to generate smb3 signature */
 };
 
 /* per smb session structure/fields */
@@ -181,6 +178,7 @@ enum smb_version {
         Smb_20,
         Smb_21,
         Smb_30,
+        Smb_302,
 };
 
 struct mid_q_entry;
@@ -197,6 +195,7 @@ struct cifs_writedata;
 struct cifs_io_parms;
 struct cifs_search_info;
 struct cifsInodeInfo;
+struct cifs_open_parms;
 
 struct smb_version_operations {
         int (*send_cancel)(struct TCP_Server_Info *, void *,
@@ -228,6 +227,7 @@ struct smb_version_operations {
         void (*dump_detail)(void *);
         void (*clear_stats)(struct cifs_tcon *);
         void (*print_stats)(struct seq_file *m, struct cifs_tcon *);
+        void (*dump_share_caps)(struct seq_file *, struct cifs_tcon *);
         /* verify the message */
         int (*check_message)(char *, unsigned int);
         bool (*is_oplock_break)(char *, struct TCP_Server_Info *);
@@ -309,9 +309,8 @@ struct smb_version_operations {
                                const char *, const char *,
                                struct cifs_sb_info *);
         /* open a file for non-posix mounts */
-        int (*open)(const unsigned int, struct cifs_tcon *, const char *, int,
-                    int, int, struct cifs_fid *, __u32 *, FILE_ALL_INFO *,
-                    struct cifs_sb_info *);
+        int (*open)(const unsigned int, struct cifs_open_parms *,
+                    __u32 *, FILE_ALL_INFO *);
         /* set fid protocol-specific info */
         void (*set_fid)(struct cifsFileInfo *, struct cifs_fid *, __u32);
         /* close a file */
@@ -367,8 +366,13 @@ struct smb_version_operations {
         void (*set_lease_key)(struct inode *, struct cifs_fid *fid);
         /* generate new lease key */
         void (*new_lease_key)(struct cifs_fid *fid);
+        /* The next two functions will need to be changed to per smb session */
+        void (*generate_signingkey)(struct TCP_Server_Info *server);
         int (*calc_signature)(struct smb_rqst *rqst,
                                    struct TCP_Server_Info *server);
+        int (*query_mf_symlink)(const unsigned char *path, char *pbuf,
+                        unsigned int *pbytes_read, struct cifs_sb_info *cifs_sb,
+                        unsigned int xid);
 };
 
 struct smb_version_values {
@@ -387,6 +391,8 @@ struct smb_version_values {
         unsigned int    cap_nt_find;
         unsigned int    cap_large_files;
         unsigned int    oplock_read;
+        __u16           signing_enabled;
+        __u16           signing_required;
 };
 
 #define HEADER_SIZE(server) (server->vals->header_size)
@@ -407,7 +413,8 @@ struct smb_vol {
         kgid_t backupgid;
         umode_t file_mode;
         umode_t dir_mode;
-        unsigned secFlg;
+        enum securityEnum sectype; /* sectype requested via mnt opts */
+        bool sign; /* was signing requested via mnt opts? */
         bool retry:1;
         bool intr:1;
         bool setuids:1;
@@ -441,6 +448,7 @@ struct smb_vol {
         bool mfsymlinks:1; /* use Minshall+French Symlinks */
         bool multiuser:1;
         bool rwpidforward:1; /* pid forward for read/write operations */
+        bool nosharesock;
         unsigned int rsize;
         unsigned int wsize;
         bool sockopt_tcp_nodelay:1;
@@ -514,6 +522,7 @@ struct TCP_Server_Info {
         struct task_struct *tsk;
         char server_GUID[16];
         __u16 sec_mode;
+        bool sign; /* is signing enabled on this connection? */
         bool session_estab; /* mark when very first sess is established */
 #ifdef CONFIG_CIFS_SMB2
         int echo_credits;  /* echo reserved slots */
@@ -521,7 +530,6 @@ struct TCP_Server_Info {
         bool echoes:1; /* enable echoes */
 #endif
         u16 dialect; /* dialect index that server chose */
-        enum securityEnum secType;
         bool oplocks:1; /* enable oplocks */
         unsigned int maxReq;    /* Clients should submit no more */
         /* than maxReq distinct unanswered SMBs to the server when using  */
@@ -540,12 +548,17 @@ struct TCP_Server_Info {
         int timeAdj;  /* Adjust for difference in server time zone in sec */
         __u64 CurrentMid;         /* multiplex id - rotating counter */
         char cryptkey[CIFS_CRYPTO_KEY_SIZE]; /* used by ntlm, ntlmv2 etc */
+        char smb3signingkey[SMB3_SIGN_KEY_SIZE]; /* for signing smb3 packets */
         /* 16th byte of RFC1001 workstation name is always null */
         char workstation_RFC1001_name[RFC1001_NAME_LEN_WITH_NULL];
         __u32 sequence_number; /* for signing, protected by srv_mutex */
         struct session_key session_key;
         unsigned long lstrp; /* when we got last response from this server */
         struct cifs_secmech secmech; /* crypto sec mech functs, descriptors */
+#define CIFS_NEGFLAVOR_LANMAN   0       /* wct == 13, LANMAN */
+#define CIFS_NEGFLAVOR_UNENCAP  1       /* wct == 17, but no ext_sec */
+#define CIFS_NEGFLAVOR_EXTENDED 2       /* wct == 17, ext_sec bit set */
+        char    negflavor;      /* NEGOTIATE response flavor */
         /* extended security flavors that server supports */
         bool    sec_ntlmssp;            /* supports NTLMSSP */
         bool    sec_kerberosu2u;        /* supports U2U Kerberos */
@@ -697,7 +710,6 @@ struct cifs_ses {
         enum statusEnum status;
         unsigned overrideSecFlg;  /* if non-zero override global sec flags */
         __u16 ipc_tid;          /* special tid for connection to IPC share */
-        __u16 flags;
         __u16 vcnum;
         char *serverOS;         /* name of operating system underlying server */
         char *serverNOS;        /* name of network operating system of server */
@@ -714,21 +726,14 @@ struct cifs_ses {
         char *password;
         struct session_key auth_key;
         struct ntlmssp_auth *ntlmssp; /* ciphertext, flags, server challenge */
+        enum securityEnum sectype; /* what security flavor was specified? */
+        bool sign;              /* is signing required? */
         bool need_reconnect:1; /* connection reset, uid now invalid */
 #ifdef CONFIG_CIFS_SMB2
         __u16 session_flags;
 #endif /* CONFIG_CIFS_SMB2 */
 };
 
-/* no more than one of the following three session flags may be set */
-#define CIFS_SES_NT4 1
-#define CIFS_SES_OS2 2
-#define CIFS_SES_W9X 4
-/* following flag is set for old servers such as OS2 (and Win95?)
-   which do not negotiate NTLM or POSIX dialects, but instead
-   negotiate one of the older LANMAN dialects */
-#define CIFS_SES_LANMAN 8
-
 static inline bool
 cap_unix(struct cifs_ses *ses)
 {
@@ -816,7 +821,7 @@ struct cifs_tcon {
 #ifdef CONFIG_CIFS_SMB2
         bool print:1;           /* set if connection to printer share */
         bool bad_network_name:1; /* set if ret status STATUS_BAD_NETWORK_NAME */
-        __u32 capabilities;
+        __le32 capabilities;
         __u32 share_flags;
         __u32 maximal_access;
         __u32 vol_serial_number;
@@ -911,6 +916,17 @@ struct cifs_search_info {
         bool smallBuf:1; /* so we know which buf_release function to call */
 };
 
+struct cifs_open_parms {
+        struct cifs_tcon *tcon;
+        struct cifs_sb_info *cifs_sb;
+        int disposition;
+        int desired_access;
+        int create_options;
+        const char *path;
+        struct cifs_fid *fid;
+        bool reconnect:1;
+};
+
 struct cifs_fid {
         __u16 netfid;
 #ifdef CONFIG_CIFS_SMB2
@@ -1348,7 +1364,7 @@ require use of the stronger protocol */
 #define   CIFSSEC_MUST_SEAL     0x40040 /* not supported yet */
 #define   CIFSSEC_MUST_NTLMSSP  0x80080 /* raw ntlmssp with ntlmv2 */
 
-#define   CIFSSEC_DEF (CIFSSEC_MAY_SIGN | CIFSSEC_MAY_NTLMSSP)
+#define   CIFSSEC_DEF (CIFSSEC_MAY_SIGN | CIFSSEC_MAY_NTLMV2 | CIFSSEC_MAY_NTLMSSP)
 #define   CIFSSEC_MAX (CIFSSEC_MUST_SIGN | CIFSSEC_MUST_NTLMV2)
 #define   CIFSSEC_AUTH_MASK (CIFSSEC_MAY_NTLM | CIFSSEC_MAY_NTLMV2 | CIFSSEC_MAY_LANMAN | CIFSSEC_MAY_PLNTXT | CIFSSEC_MAY_KRB5 | CIFSSEC_MAY_NTLMSSP)
 /*
@@ -1494,4 +1510,7 @@ extern struct smb_version_values smb21_values;
 #define SMB30_VERSION_STRING    "3.0"
 extern struct smb_version_operations smb30_operations;
 extern struct smb_version_values smb30_values;
+#define SMB302_VERSION_STRING   "3.02"
+/*extern struct smb_version_operations smb302_operations;*/ /* not needed yet */
+extern struct smb_version_values smb302_values;
 #endif  /* _CIFS_GLOB_H */