Loading fs/cifs/cifsencrypt.c +53 −51 Original line number Diff line number Diff line Loading @@ -29,7 +29,7 @@ #include <linux/ctype.h> #include <linux/random.h> /* Calculate and return the CIFS signature based on the mac key and the smb pdu */ /* Calculate and return the CIFS signature based on the mac key and SMB PDU */ /* the 16 byte signature must be allocated by the caller */ /* Note we only use the 1st eight bytes */ /* Note that the smb header signature field on input contains the Loading Loading @@ -68,14 +68,16 @@ int cifs_sign_smb(struct smb_hdr * cifs_pdu, struct TCP_Server_Info * server, return rc; spin_lock(&GlobalMid_Lock); cifs_pdu->Signature.Sequence.SequenceNumber = cpu_to_le32(server->sequence_number); cifs_pdu->Signature.Sequence.SequenceNumber = cpu_to_le32(server->sequence_number); cifs_pdu->Signature.Sequence.Reserved = 0; *pexpected_response_sequence_number = server->sequence_number++; server->sequence_number++; spin_unlock(&GlobalMid_Lock); rc = cifs_calculate_signature(cifs_pdu, server->mac_signing_key,smb_signature); rc = cifs_calculate_signature(cifs_pdu, server->mac_signing_key, smb_signature); if (rc) memset(cifs_pdu->Signature.SecuritySignature, 0, 8); else Loading Loading @@ -147,7 +149,6 @@ int cifs_sign_smb2(struct kvec * iov, int n_vec, struct TCP_Server_Info *server, memcpy(cifs_pdu->Signature.SecuritySignature, smb_signature, 8); return rc; } int cifs_verify_signature(struct smb_hdr *cifs_pdu, const char *mac_key, Loading @@ -164,7 +165,8 @@ int cifs_verify_signature(struct smb_hdr * cifs_pdu, const char * mac_key, return 0; if (cifs_pdu->Command == SMB_COM_LOCKING_ANDX) { struct smb_com_lock_req * pSMB = (struct smb_com_lock_req *)cifs_pdu; struct smb_com_lock_req * pSMB = (struct smb_com_lock_req *)cifs_pdu; if (pSMB->LockType & LOCKING_ANDX_OPLOCK_RELEASE) return 0; } Loading fs/cifs/cifs_debug.c +5 −5 File changed.Contains only whitespace changes. Show changes Loading
fs/cifs/cifsencrypt.c +53 −51 Original line number Diff line number Diff line Loading @@ -29,7 +29,7 @@ #include <linux/ctype.h> #include <linux/random.h> /* Calculate and return the CIFS signature based on the mac key and the smb pdu */ /* Calculate and return the CIFS signature based on the mac key and SMB PDU */ /* the 16 byte signature must be allocated by the caller */ /* Note we only use the 1st eight bytes */ /* Note that the smb header signature field on input contains the Loading Loading @@ -68,14 +68,16 @@ int cifs_sign_smb(struct smb_hdr * cifs_pdu, struct TCP_Server_Info * server, return rc; spin_lock(&GlobalMid_Lock); cifs_pdu->Signature.Sequence.SequenceNumber = cpu_to_le32(server->sequence_number); cifs_pdu->Signature.Sequence.SequenceNumber = cpu_to_le32(server->sequence_number); cifs_pdu->Signature.Sequence.Reserved = 0; *pexpected_response_sequence_number = server->sequence_number++; server->sequence_number++; spin_unlock(&GlobalMid_Lock); rc = cifs_calculate_signature(cifs_pdu, server->mac_signing_key,smb_signature); rc = cifs_calculate_signature(cifs_pdu, server->mac_signing_key, smb_signature); if (rc) memset(cifs_pdu->Signature.SecuritySignature, 0, 8); else Loading Loading @@ -147,7 +149,6 @@ int cifs_sign_smb2(struct kvec * iov, int n_vec, struct TCP_Server_Info *server, memcpy(cifs_pdu->Signature.SecuritySignature, smb_signature, 8); return rc; } int cifs_verify_signature(struct smb_hdr *cifs_pdu, const char *mac_key, Loading @@ -164,7 +165,8 @@ int cifs_verify_signature(struct smb_hdr * cifs_pdu, const char * mac_key, return 0; if (cifs_pdu->Command == SMB_COM_LOCKING_ANDX) { struct smb_com_lock_req * pSMB = (struct smb_com_lock_req *)cifs_pdu; struct smb_com_lock_req * pSMB = (struct smb_com_lock_req *)cifs_pdu; if (pSMB->LockType & LOCKING_ANDX_OPLOCK_RELEASE) return 0; } Loading