Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e89ce1f8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 501d9f79 6e3c1529

fs/cifs/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -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)) {

fs/cifs/smb2pdu.h

+2 −2
Original line number Diff line number Diff line
@@ -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)