Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge tag 'cifs-fixes-for-4.13-rc7-and-stable' of git://git.samba.org/sfrench/cifs-2.6

Pull cifs fixes from Steve French:
 "Two cifs bug fixes for stable"

* tag 'cifs-fixes-for-4.13-rc7-and-stable' of git://git.samba.org/sfrench/cifs-2.6:
  CIFS: remove endian related sparse warning
  CIFS: Fix maximum SMB2 header size
Linus Torvalds 8 years ago
parent
501d9f7945 6e3c1529c3
commit
e89ce1f89f
2 changed files with 3 additions and 3 deletions
Split View Show Diff Stats
  1. 1 1
      fs/cifs/dir.c
  2. 2 2
      fs/cifs/smb2pdu.h

+ 1 - 1
fs/cifs/dir.c
View File 

@@ -205,7 +205,7 @@ check_name(struct dentry *direntry, struct cifs_tcon *tcon)
 
 	int i;
 
 
 	if (unlikely(direntry->d_name.len >
 
-		     tcon->fsAttrInfo.MaxPathNameComponentLength))
 
+		     le32_to_cpu(tcon->fsAttrInfo.MaxPathNameComponentLength)))
 
 		return -ENAMETOOLONG;
 
 
 	if (!(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_POSIX_PATHS)) {

+ 2 - 2
fs/cifs/smb2pdu.h
View File 

@@ -84,8 +84,8 @@
 
 
 #define NUMBER_OF_SMB2_COMMANDS	0x0013
 
 
-/* BB FIXME - analyze following length BB */
 
-#define MAX_SMB2_HDR_SIZE 0x78 /* 4 len + 64 hdr + (2*24 wct) + 2 bct + 2 pad */
 
+/* 4 len + 52 transform hdr + 64 hdr + 56 create rsp */
 
+#define MAX_SMB2_HDR_SIZE 0x00b0
 
 
 #define SMB2_PROTO_NUMBER cpu_to_le32(0x424d53fe)
 
 #define SMB2_TRANSFORM_PROTO_NUM cpu_to_le32(0x424d53fd)