Commit 01fa4ba5 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:
  update cifs version to 1.75
  [CIFS] possible memory corruption on mount
  cifs: demote cERROR in build_path_from_dentry to cFYI
parents fbad8991 04c05b4a

fs/cifs/cifsfs.h

+1 −1
Original line number Diff line number Diff line
@@ -125,5 +125,5 @@ extern long cifs_ioctl(struct file *filep, unsigned int cmd, unsigned long arg); 
extern const struct export_operations cifs_export_ops;

#endif /* CIFS_NFSD_EXPORT */



#define CIFS_VERSION   "1.74"

#define CIFS_VERSION   "1.75"

#endif				/* _CIFSFS_H */

fs/cifs/connect.c

+2 −1
Original line number Diff line number Diff line
@@ -2878,6 +2878,7 @@ cleanup_volume_info_contents(struct smb_vol *volume_info) 
	kfree(volume_info->username);

	kzfree(volume_info->password);

	kfree(volume_info->UNC);

	if (volume_info->UNCip != volume_info->UNC + 2)

		kfree(volume_info->UNCip);

	kfree(volume_info->domainname);

	kfree(volume_info->iocharset);

fs/cifs/dir.c

+2 −2
Original line number Diff line number Diff line
@@ -105,8 +105,8 @@ cifs_bp_rename_retry: 
	}

	rcu_read_unlock();

	if (namelen != dfsplen || read_seqretry(&rename_lock, seq)) {

		cERROR(1, "did not end path lookup where expected namelen is %d",

			namelen);

		cFYI(1, "did not end path lookup where expected. namelen=%d "

			"dfsplen=%d", namelen, dfsplen);

		/* presumably this is only possible if racing with a rename

		of one of the parent directories  (we can not lock the dentries

		above us to prevent this, but retrying should be harmless) */