+4

fs/cifs/CHANGES

reviewed

··· 1 1 + Version 1.47 2 2 + ------------ 3 3 + Fix oops in list_del during mount caused by unaligned string. 4 4 + 1 5 Version 1.46 2 6 ------------ 3 7 Support deep tree mounts. Better support OS/2, Win9x (DOS) time stamps.

+2 -2

fs/cifs/cifs_debug.c

reviewed

··· 143 143 ses = list_entry(tmp, struct cifsSesInfo, cifsSessionList); 144 144 if((ses->serverDomain == NULL) || (ses->serverOS == NULL) || 145 145 (ses->serverNOS == NULL)) { 146 146 - buf += sprintf("\nentry for %s not fully displayed\n\t", 147 147 - ses->serverName); 146 146 + buf += sprintf(buf, "\nentry for %s not fully " 147 147 + "displayed\n\t", ses->serverName); 148 148 149 149 } else { 150 150 length =

+1 -1

fs/cifs/cifsfs.h

reviewed

··· 100 100 extern ssize_t cifs_listxattr(struct dentry *, char *, size_t); 101 101 extern int cifs_ioctl (struct inode * inode, struct file * filep, 102 102 unsigned int command, unsigned long arg); 103 103 - #define CIFS_VERSION "1.46" 103 103 + #define CIFS_VERSION "1.47" 104 104 #endif /* _CIFSFS_H */

+2 -6

fs/cifs/misc.c

reviewed

··· 71 71 { 72 72 struct cifsSesInfo *ret_buf; 73 73 74 74 - ret_buf = 75 75 - (struct cifsSesInfo *) kzalloc(sizeof (struct cifsSesInfo), 76 76 - GFP_KERNEL); 74 74 + ret_buf = kzalloc(sizeof (struct cifsSesInfo), GFP_KERNEL); 77 75 if (ret_buf) { 78 76 write_lock(&GlobalSMBSeslock); 79 77 atomic_inc(&sesInfoAllocCount); ··· 107 109 tconInfoAlloc(void) 108 110 { 109 111 struct cifsTconInfo *ret_buf; 110 110 - ret_buf = 111 111 - (struct cifsTconInfo *) kzalloc(sizeof (struct cifsTconInfo), 112 112 - GFP_KERNEL); 112 112 + ret_buf = kzalloc(sizeof (struct cifsTconInfo), GFP_KERNEL); 113 113 if (ret_buf) { 114 114 write_lock(&GlobalSMBSeslock); 115 115 atomic_inc(&tconInfoAllocCount);

+8 -5

fs/cifs/sess.c

reviewed

··· 182 182 cFYI(1,("bleft %d",bleft)); 183 183 184 184 185 185 - /* word align, if bytes remaining is not even */ 186 186 - if(bleft % 2) { 187 187 - bleft--; 188 188 - data++; 189 189 - } 185 185 + /* SMB header is unaligned, so cifs servers word align start of 186 186 + Unicode strings */ 187 187 + data++; 188 188 + bleft--; /* Windows servers do not always double null terminate 189 189 + their final Unicode string - in which case we 190 190 + now will not attempt to decode the byte of junk 191 191 + which follows it */ 192 192 + 190 193 words_left = bleft / 2; 191 194 192 195 /* save off server operating system */