diff --git a/[refs] b/[refs]
index 98f454f59e88..af92c8e62f7d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 31c0519f7af99ae60fd39f7f1c1f7ae1efb56760
+refs/heads/master: 96c03bccc7defb1f0d486165af5c0b8590f56c11
diff --git a/trunk/fs/cifs/CHANGES b/trunk/fs/cifs/CHANGES
index 49503d2edc7e..bc0025cdd1c9 100644
--- a/trunk/fs/cifs/CHANGES
+++ b/trunk/fs/cifs/CHANGES
@@ -1,6 +1,7 @@
 Version 1.62
 ------------
-Add sockopt=TCP_NODELAY mount option.
+Add sockopt=TCP_NODELAY mount option. EA (xattr) routines hardened
+to more strictly handle corrupt frames.
 
 Version 1.61
 ------------
diff --git a/trunk/fs/cifs/cifssmb.c b/trunk/fs/cifs/cifssmb.c
index d6d40b883abc..99ae57d01d4f 100644
--- a/trunk/fs/cifs/cifssmb.c
+++ b/trunk/fs/cifs/cifssmb.c
@@ -5392,7 +5392,7 @@ CIFSSMBQAllEAs(const int xid, struct cifsTconInfo *tcon,
 	temp_fea = ea_response_data->list;
 	temp_ptr = (char *)temp_fea;
 	while (list_len > 0) {
-		__u8 name_len;
+		int name_len;
 		__u16 value_len;
 
 		list_len -= 4;