cifs: move handling of signed connections into separate function

Move the sanity checks for signed connections into a separate function.
SMB2's was a cut-and-paste job from CIFS code, so we can make them use
the same function.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Pavel Shilovsky <piastry@etersoft.ru>
Signed-off-by: Steve French <smfrench@gmail.com>

1 files changed, 4 insertions, 29 deletions

diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
index 3af66aa18d3b..ebb97b484ab1 100644
--- a/fs/cifs/smb2pdu.c
+++ b/fs/cifs/smb2pdu.c
@@ -423,36 +423,11 @@ SMB2_negotiate(const unsigned int xid, struct cifs_ses *ses)
         }
 
         cifs_dbg(FYI, "sec_flags 0x%x\n", sec_flags);
-        if ((sec_flags & CIFSSEC_MUST_SIGN) == CIFSSEC_MUST_SIGN) {
-                cifs_dbg(FYI, "Signing required\n");
-                if (!(server->sec_mode & (SMB2_NEGOTIATE_SIGNING_REQUIRED |
-                      SMB2_NEGOTIATE_SIGNING_ENABLED))) {
-                        cifs_dbg(VFS, "signing required but server lacks support\n");
-                        rc = -EOPNOTSUPP;
-                        goto neg_exit;
-                }
-                server->sec_mode |= SECMODE_SIGN_REQUIRED;
-        } else if (sec_flags & CIFSSEC_MAY_SIGN) {
-                cifs_dbg(FYI, "Signing optional\n");
-                if (server->sec_mode & SMB2_NEGOTIATE_SIGNING_REQUIRED) {
-                        cifs_dbg(FYI, "Server requires signing\n");
-                        server->sec_mode |= SECMODE_SIGN_REQUIRED;
-                } else {
-                        server->sec_mode &=
-                                ~(SECMODE_SIGN_ENABLED | SECMODE_SIGN_REQUIRED);
-                }
-        } else {
-                cifs_dbg(FYI, "Signing disabled\n");
-                if (server->sec_mode & SMB2_NEGOTIATE_SIGNING_REQUIRED) {
-                        cifs_dbg(VFS, "Server requires packet signing to be enabled in /proc/fs/cifs/SecurityFlags\n");
-                        rc = -EOPNOTSUPP;
-                        goto neg_exit;
-                }
-                server->sec_mode &=
-                        ~(SECMODE_SIGN_ENABLED | SECMODE_SIGN_REQUIRED);
-        }
-
+        rc = cifs_enable_signing(server, sec_flags);
 #ifdef CONFIG_SMB2_ASN1  /* BB REMOVEME when updated asn1.c ready */
+        if (rc)
+                goto neg_exit;
+
         rc = decode_neg_token_init(security_blob, blob_length,
                                    &server->sec_type);
         if (rc == 1)