diff --git a/fs/cifs/CHANGES b/fs/cifs/CHANGES
index 49503d2edc7eb74ff8277f946979c7b183ec1def..bc0025cdd1c9c0d285c32e8d7656103868126ca8 100644
--- a/fs/cifs/CHANGES
+++ b/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/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
index d6d40b883abc3511f299acee5e9662e774f50fc1..99ae57d01d4f668797ea4aebda9cfb7f2dd8e519 100644
--- a/fs/cifs/cifssmb.c
+++ b/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;