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

Commit 5394cd21 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
  [CIFS] Fix oops when Windows server sent bad domain name null terminator
  [CIFS]  cifs sprintf fix
  [CIFS] Remove 2 unneeded kzalloc casts
  [CIFS] Update CIFS version number
parents 6f3776c9 8e6f195a

fs/cifs/CHANGES

+4 −0
Original line number Diff line number Diff line 
Version 1.47

------------

Fix oops in list_del during mount caused by unaligned string.



Version 1.46

------------

Support deep tree mounts.  Better support OS/2, Win9x (DOS) time stamps.

fs/cifs/cifs_debug.c

+2 −2
Original line number Diff line number Diff line
@@ -143,8 +143,8 @@ cifs_debug_data_read(char *buf, char **beginBuffer, off_t offset, 
		ses = list_entry(tmp, struct cifsSesInfo, cifsSessionList);

		if((ses->serverDomain == NULL) || (ses->serverOS == NULL) ||

		   (ses->serverNOS == NULL)) {

			buf += sprintf("\nentry for %s not fully displayed\n\t",

					ses->serverName);

			buf += sprintf(buf, "\nentry for %s not fully "

					"displayed\n\t", ses->serverName);

			

		} else {

			length =

fs/cifs/cifsfs.h

+1 −1
Original line number Diff line number Diff line
@@ -100,5 +100,5 @@ extern ssize_t cifs_getxattr(struct dentry *, const char *, void *, size_t); 
extern ssize_t	cifs_listxattr(struct dentry *, char *, size_t);

extern int cifs_ioctl (struct inode * inode, struct file * filep,

		       unsigned int command, unsigned long arg);

#define CIFS_VERSION   "1.46"

#define CIFS_VERSION   "1.47"

#endif				/* _CIFSFS_H */

fs/cifs/misc.c

+2 −6
Original line number Diff line number Diff line
@@ -71,9 +71,7 @@ sesInfoAlloc(void) 
{

	struct cifsSesInfo *ret_buf;



	ret_buf =

	    (struct cifsSesInfo *) kzalloc(sizeof (struct cifsSesInfo),

					   GFP_KERNEL);

	ret_buf = kzalloc(sizeof (struct cifsSesInfo), GFP_KERNEL);

	if (ret_buf) {

		write_lock(&GlobalSMBSeslock);

		atomic_inc(&sesInfoAllocCount);
@@ -109,9 +107,7 @@ struct cifsTconInfo * 
tconInfoAlloc(void)

{

	struct cifsTconInfo *ret_buf;

	ret_buf =

	    (struct cifsTconInfo *) kzalloc(sizeof (struct cifsTconInfo),

					    GFP_KERNEL);

	ret_buf = kzalloc(sizeof (struct cifsTconInfo), GFP_KERNEL);

	if (ret_buf) {

		write_lock(&GlobalSMBSeslock);

		atomic_inc(&tconInfoAllocCount);

fs/cifs/sess.c

+8 −5
Original line number Diff line number Diff line
@@ -182,11 +182,14 @@ static int decode_unicode_ssetup(char ** pbcc_area, int bleft, struct cifsSesInf 
	cFYI(1,("bleft %d",bleft));





	/* word align, if bytes remaining is not even */

	if(bleft % 2) {

		bleft--;

	/* SMB header is unaligned, so cifs servers word align start of

	   Unicode strings */

	data++;

	}

	bleft--; /* Windows servers do not always double null terminate

		    their final Unicode string - in which case we

		    now will not attempt to decode the byte of junk

		    which follows it */

		    

	words_left = bleft / 2;



	/* save off server operating system */