Commit f6614b7b 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 a memleak in cifs_setattr_nounix()
  cifs: make cifs_ioctl handle NULL filp->private_data correctly
parents 63bfd738 3565bd46

fs/cifs/inode.c

+0 −1
Original line number Diff line number Diff line
@@ -2177,7 +2177,6 @@ cifs_setattr_nounix(struct dentry *direntry, struct iattr *attrs) 


	setattr_copy(inode, attrs);

	mark_inode_dirty(inode);

	return 0;



cifs_setattr_exit:

	kfree(full_path);

fs/cifs/ioctl.c

+10 −2
Original line number Diff line number Diff line
@@ -38,10 +38,10 @@ long cifs_ioctl(struct file *filep, unsigned int command, unsigned long arg) 
	struct cifs_sb_info *cifs_sb;

#ifdef CONFIG_CIFS_POSIX

	struct cifsFileInfo *pSMBFile = filep->private_data;

	struct cifsTconInfo *tcon = tlink_tcon(pSMBFile->tlink);

	struct cifsTconInfo *tcon;

	__u64	ExtAttrBits = 0;

	__u64	ExtAttrMask = 0;

	__u64   caps = le64_to_cpu(tcon->fsUnixInfo.Capability);

	__u64   caps;

#endif /* CONFIG_CIFS_POSIX */



	xid = GetXid();
@@ -62,6 +62,10 @@ long cifs_ioctl(struct file *filep, unsigned int command, unsigned long arg) 
			break;

#ifdef CONFIG_CIFS_POSIX

		case FS_IOC_GETFLAGS:

			if (pSMBFile == NULL)

				break;

			tcon = tlink_tcon(pSMBFile->tlink);

			caps = le64_to_cpu(tcon->fsUnixInfo.Capability);

			if (CIFS_UNIX_EXTATTR_CAP & caps) {

				rc = CIFSGetExtAttr(xid, tcon, pSMBFile->netfid,

					&ExtAttrBits, &ExtAttrMask);
@@ -73,6 +77,10 @@ long cifs_ioctl(struct file *filep, unsigned int command, unsigned long arg) 
			break;



		case FS_IOC_SETFLAGS:

			if (pSMBFile == NULL)

				break;

			tcon = tlink_tcon(pSMBFile->tlink);

			caps = le64_to_cpu(tcon->fsUnixInfo.Capability);

			if (CIFS_UNIX_EXTATTR_CAP & caps) {

				if (get_user(ExtAttrBits, (int __user *)arg)) {

					rc = -EFAULT;