Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6

Pull CIFS fixes from Steve French: "A set of three minor cifs fixes" * 'for-linus' of git://git.samba.org/sfrench/cifs-2.6: cifs: make new inode cache when file type is different Fix signed/unsigned pointer warning Convert MessageID in smb2_hdr to LE

Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6
Pull CIFS fixes from Steve French: "A set of three minor cifs fixes" * 'for-linus' of git://git.samba.org/sfrench/cifs-2.6: cifs: make new inode cache when file type is different Fix signed/unsigned pointer warning Convert MessageID in smb2_hdr to LE
Linus Torvalds
2 parents b9d4a35f0a 9e6d722f3d
Showing 7 changed files Side-by-side Diff
fs/cifs/cifsglob.h
fs/cifs/netmisc.c
fs/cifs/readdir.c
fs/cifs/smb2misc.c
fs/cifs/smb2ops.c
fs/cifs/smb2pdu.h
fs/cifs/smb2transport.c
@@ -661,16 +661,16 @@
 	server->ops->set_credits(server, val);
 }
  
-static inline __u64
+static inline __le64
 get_next_mid64(struct TCP_Server_Info *server)
 {
-	return server->ops->get_next_mid(server);
+	return cpu_to_le64(server->ops->get_next_mid(server));
 }
  
 static inline __le16
 get_next_mid(struct TCP_Server_Info *server)
 {
-	__u16 mid = get_next_mid64(server);
+	__u16 mid = server->ops->get_next_mid(server);
 	/*
 	 * The value in the SMB header should be little endian for easy
 	 * on-the-wire decoding.
@@ -926,6 +926,7 @@
  
 	/* Subtract the NTFS time offset, then convert to 1s intervals. */
 	s64 t = le64_to_cpu(ntutc) - NTFS_TIME_OFFSET;
+	u64 abs_t;
  
 	/*
 	 * Unfortunately can not use normal 64 bit division on 32 bit arch, but
  
  
@@ -933,13 +934,14 @@
 	 * to special case them
 	 */
 	if (t < 0) {
-		t = -t;
-		ts.tv_nsec = (long)(do_div(t, 10000000) * 100);
+		abs_t = -t;
+		ts.tv_nsec = (long)(do_div(abs_t, 10000000) * 100);
 		ts.tv_nsec = -ts.tv_nsec;
-		ts.tv_sec = -t;
+		ts.tv_sec = -abs_t;
 	} else {
-		ts.tv_nsec = (long)do_div(t, 10000000) * 100;
-		ts.tv_sec = t;
+		abs_t = t;
+		ts.tv_nsec = (long)do_div(abs_t, 10000000) * 100;
+		ts.tv_sec = abs_t;
 	}
  
 	return ts;
@@ -69,7 +69,8 @@
  * Attempt to preload the dcache with the results from the FIND_FIRST/NEXT
  *
  * Find the dentry that matches "name". If there isn't one, create one. If it's
- * a negative dentry or the uniqueid changed, then drop it and recreate it.
+ * a negative dentry or the uniqueid or filetype(mode) changed,
+ * then drop it and recreate it.
  */
 static void
 cifs_prime_dcache(struct dentry *parent, struct qstr *name,
@@ -97,8 +98,11 @@
 			if (!(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SERVER_INUM))
 				fattr->cf_uniqueid = CIFS_I(inode)->uniqueid;
  
-			/* update inode in place if i_ino didn't change */
-			if (CIFS_I(inode)->uniqueid == fattr->cf_uniqueid) {
+			/* update inode in place
+			 * if both i_ino and i_mode didn't change */
+			if (CIFS_I(inode)->uniqueid == fattr->cf_uniqueid &&
+			    (inode->i_mode & S_IFMT) ==
+			    (fattr->cf_mode & S_IFMT)) {
 				cifs_fattr_to_inode(inode, fattr);
 				goto out;
 			}
@@ -32,12 +32,14 @@
 static int
 check_smb2_hdr(struct smb2_hdr *hdr, __u64 mid)
 {
+	__u64 wire_mid = le64_to_cpu(hdr->MessageId);
+
 	/*
 	 * Make sure that this really is an SMB, that it is a response,
 	 * and that the message ids match.
 	 */
 	if ((*(__le32 *)hdr->ProtocolId == SMB2_PROTO_NUMBER) &&
-	    (mid == hdr->MessageId)) {
+	    (mid == wire_mid)) {
 		if (hdr->Flags & SMB2_FLAGS_SERVER_TO_REDIR)
 			return 0;
 		else {
  
  
@@ -51,11 +53,11 @@
 		if (*(__le32 *)hdr->ProtocolId != SMB2_PROTO_NUMBER)
 			cifs_dbg(VFS, "Bad protocol string signature header %x\n",
 				 *(unsigned int *) hdr->ProtocolId);
-		if (mid != hdr->MessageId)
+		if (mid != wire_mid)
 			cifs_dbg(VFS, "Mids do not match: %llu and %llu\n",
-				 mid, hdr->MessageId);
+				 mid, wire_mid);
 	}
-	cifs_dbg(VFS, "Bad SMB detected. The Mid=%llu\n", hdr->MessageId);
+	cifs_dbg(VFS, "Bad SMB detected. The Mid=%llu\n", wire_mid);
 	return 1;
 }
  
@@ -95,7 +97,7 @@
 {
 	struct smb2_hdr *hdr = (struct smb2_hdr *)buf;
 	struct smb2_pdu *pdu = (struct smb2_pdu *)hdr;
-	__u64 mid = hdr->MessageId;
+	__u64 mid = le64_to_cpu(hdr->MessageId);
 	__u32 len = get_rfc1002_length(buf);
 	__u32 clc_len;  /* calculated length */
 	int command;
@@ -176,10 +176,11 @@
 {
 	struct mid_q_entry *mid;
 	struct smb2_hdr *hdr = (struct smb2_hdr *)buf;
+	__u64 wire_mid = le64_to_cpu(hdr->MessageId);
  
 	spin_lock(&GlobalMid_Lock);
 	list_for_each_entry(mid, &server->pending_mid_q, qhead) {
-		if ((mid->mid == hdr->MessageId) &&
+		if ((mid->mid == wire_mid) &&
 		    (mid->mid_state == MID_REQUEST_SUBMITTED) &&
 		    (mid->command == hdr->Command)) {
 			spin_unlock(&GlobalMid_Lock);
@@ -110,7 +110,7 @@
 	__le16 CreditRequest;  /* CreditResponse */
 	__le32 Flags;
 	__le32 NextCommand;
-	__u64  MessageId;	/* opaque - so can stay little endian */
+	__le64 MessageId;
 	__le32 ProcessId;
 	__u32  TreeId;		/* opaque - so do not make little endian */
 	__u64  SessionId;	/* opaque - so do not make little endian */
@@ -490,7 +490,7 @@
 		return temp;
 	else {
 		memset(temp, 0, sizeof(struct mid_q_entry));
-		temp->mid = smb_buffer->MessageId;	/* always LE */
+		temp->mid = le64_to_cpu(smb_buffer->MessageId);
 		temp->pid = current->pid;
 		temp->command = smb_buffer->Command;	/* Always LE */
 		temp->when_alloc = jiffies;
...	...	@@ -661,16 +661,16 @@
661	661	server->ops->set_credits(server, val);
662	662	}
663	663
664		-static inline __u64
	664	+static inline __le64
665	665	get_next_mid64(struct TCP_Server_Info *server)
666	666	{
667		- return server->ops->get_next_mid(server);
	667	+ return cpu_to_le64(server->ops->get_next_mid(server));
668	668	}
669	669
670	670	static inline __le16
671	671	get_next_mid(struct TCP_Server_Info *server)
672	672	{
673		- __u16 mid = get_next_mid64(server);
	673	+ __u16 mid = server->ops->get_next_mid(server);
674	674	/*
675	675	* The value in the SMB header should be little endian for easy
676	676	* on-the-wire decoding.
...	...	@@ -926,6 +926,7 @@
926	926
927	927	/* Subtract the NTFS time offset, then convert to 1s intervals. */
928	928	s64 t = le64_to_cpu(ntutc) - NTFS_TIME_OFFSET;
	929	+ u64 abs_t;
929	930
930	931	/*
931	932	* Unfortunately can not use normal 64 bit division on 32 bit arch, but
932	933
933	934
...	...	@@ -933,13 +934,14 @@
933	934	* to special case them
934	935	*/
935	936	if (t < 0) {
936		- t = -t;
937		- ts.tv_nsec = (long)(do_div(t, 10000000) * 100);
	937	+ abs_t = -t;
	938	+ ts.tv_nsec = (long)(do_div(abs_t, 10000000) * 100);
938	939	ts.tv_nsec = -ts.tv_nsec;
939		- ts.tv_sec = -t;
	940	+ ts.tv_sec = -abs_t;
940	941	} else {
941		- ts.tv_nsec = (long)do_div(t, 10000000) * 100;
942		- ts.tv_sec = t;
	942	+ abs_t = t;
	943	+ ts.tv_nsec = (long)do_div(abs_t, 10000000) * 100;
	944	+ ts.tv_sec = abs_t;
943	945	}
944	946
945	947	return ts;
...	...	@@ -69,7 +69,8 @@
69	69	* Attempt to preload the dcache with the results from the FIND_FIRST/NEXT
70	70	*
71	71	* Find the dentry that matches "name". If there isn't one, create one. If it's
72		- * a negative dentry or the uniqueid changed, then drop it and recreate it.
	72	+ * a negative dentry or the uniqueid or filetype(mode) changed,
	73	+ * then drop it and recreate it.
73	74	*/
74	75	static void
75	76	cifs_prime_dcache(struct dentry parent, struct qstr name,
...	...	@@ -97,8 +98,11 @@
97	98	if (!(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SERVER_INUM))
98	99	fattr->cf_uniqueid = CIFS_I(inode)->uniqueid;
99	100
100		- /* update inode in place if i_ino didn't change */
101		- if (CIFS_I(inode)->uniqueid == fattr->cf_uniqueid) {
	101	+ /* update inode in place
	102	+ * if both i_ino and i_mode didn't change */
	103	+ if (CIFS_I(inode)->uniqueid == fattr->cf_uniqueid &&
	104	+ (inode->i_mode & S_IFMT) ==
	105	+ (fattr->cf_mode & S_IFMT)) {
102	106	cifs_fattr_to_inode(inode, fattr);
103	107	goto out;
104	108	}
...	...	@@ -32,12 +32,14 @@
32	32	static int
33	33	check_smb2_hdr(struct smb2_hdr *hdr, __u64 mid)
34	34	{
	35	+ __u64 wire_mid = le64_to_cpu(hdr->MessageId);
	36	+
35	37	/*
36	38	* Make sure that this really is an SMB, that it is a response,
37	39	* and that the message ids match.
38	40	*/
39	41	if (((__le32 )hdr->ProtocolId == SMB2_PROTO_NUMBER) &&
40		- (mid == hdr->MessageId)) {
	42	+ (mid == wire_mid)) {
41	43	if (hdr->Flags & SMB2_FLAGS_SERVER_TO_REDIR)
42	44	return 0;
43	45	else {
44	46
45	47
...	...	@@ -51,11 +53,11 @@
51	53	if ((__le32 )hdr->ProtocolId != SMB2_PROTO_NUMBER)
52	54	cifs_dbg(VFS, "Bad protocol string signature header %x\n",
53	55	(unsigned int ) hdr->ProtocolId);
54		- if (mid != hdr->MessageId)
	56	+ if (mid != wire_mid)
55	57	cifs_dbg(VFS, "Mids do not match: %llu and %llu\n",
56		- mid, hdr->MessageId);
	58	+ mid, wire_mid);
57	59	}
58		- cifs_dbg(VFS, "Bad SMB detected. The Mid=%llu\n", hdr->MessageId);
	60	+ cifs_dbg(VFS, "Bad SMB detected. The Mid=%llu\n", wire_mid);
59	61	return 1;
60	62	}
61	63
...	...	@@ -95,7 +97,7 @@
95	97	{
96	98	struct smb2_hdr hdr = (struct smb2_hdr )buf;
97	99	struct smb2_pdu pdu = (struct smb2_pdu )hdr;
98		- __u64 mid = hdr->MessageId;
	100	+ __u64 mid = le64_to_cpu(hdr->MessageId);
99	101	__u32 len = get_rfc1002_length(buf);
100	102	__u32 clc_len; /* calculated length */
101	103	int command;
...	...	@@ -176,10 +176,11 @@
176	176	{
177	177	struct mid_q_entry *mid;
178	178	struct smb2_hdr hdr = (struct smb2_hdr )buf;
	179	+ __u64 wire_mid = le64_to_cpu(hdr->MessageId);
179	180
180	181	spin_lock(&GlobalMid_Lock);
181	182	list_for_each_entry(mid, &server->pending_mid_q, qhead) {
182		- if ((mid->mid == hdr->MessageId) &&
	183	+ if ((mid->mid == wire_mid) &&
183	184	(mid->mid_state == MID_REQUEST_SUBMITTED) &&
184	185	(mid->command == hdr->Command)) {
185	186	spin_unlock(&GlobalMid_Lock);
...	...	@@ -110,7 +110,7 @@
110	110	__le16 CreditRequest; /* CreditResponse */
111	111	__le32 Flags;
112	112	__le32 NextCommand;
113		- __u64 MessageId; /* opaque - so can stay little endian */
	113	+ __le64 MessageId;
114	114	__le32 ProcessId;
115	115	__u32 TreeId; /* opaque - so do not make little endian */
116	116	__u64 SessionId; /* opaque - so do not make little endian */
...	...	@@ -490,7 +490,7 @@
490	490	return temp;
491	491	else {
492	492	memset(temp, 0, sizeof(struct mid_q_entry));
493		- temp->mid = smb_buffer->MessageId; /* always LE */
	493	+ temp->mid = le64_to_cpu(smb_buffer->MessageId);
494	494	temp->pid = current->pid;
495	495	temp->command = smb_buffer->Command; /* Always LE */
496	496	temp->when_alloc = jiffies;