Commit 8e8bb96d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.samba.org/sfrench/cifs-2.6 

Pull CIFS fixes from Steve French.

* git://git.samba.org/sfrench/cifs-2.6:
  CIFS: Do not kmalloc under the flocks spinlock
  cifs: possible memory leak in xattr.
parents cd794539 d5751469

fs/cifs/file.c

+56 −13
Original line number Diff line number Diff line
@@ -920,16 +920,26 @@ cifs_push_mandatory_locks(struct cifsFileInfo *cfile) 
	for (lockp = &inode->i_flock; *lockp != NULL; \

	     lockp = &(*lockp)->fl_next)



struct lock_to_push {

	struct list_head llist;

	__u64 offset;

	__u64 length;

	__u32 pid;

	__u16 netfid;

	__u8 type;

};



static int

cifs_push_posix_locks(struct cifsFileInfo *cfile)

{

	struct cifsInodeInfo *cinode = CIFS_I(cfile->dentry->d_inode);

	struct cifs_tcon *tcon = tlink_tcon(cfile->tlink);

	struct file_lock *flock, **before;

	struct cifsLockInfo *lck, *tmp;

	unsigned int count = 0, i = 0;

	int rc = 0, xid, type;

	struct list_head locks_to_send, *el;

	struct lock_to_push *lck, *tmp;

	__u64 length;

	struct list_head locks_to_send;



	xid = GetXid();
@@ -940,29 +950,55 @@ cifs_push_posix_locks(struct cifsFileInfo *cfile) 
		return rc;

	}



	lock_flocks();

	cifs_for_each_lock(cfile->dentry->d_inode, before) {

		if ((*before)->fl_flags & FL_POSIX)

			count++;

	}

	unlock_flocks();



	INIT_LIST_HEAD(&locks_to_send);



	/*

	 * Allocating count locks is enough because no locks can be added to

	 * the list while we are holding cinode->lock_mutex that protects

	 * locking operations of this inode.

	 */

	for (; i < count; i++) {

		lck = kmalloc(sizeof(struct lock_to_push), GFP_KERNEL);

		if (!lck) {

			rc = -ENOMEM;

			goto err_out;

		}

		list_add_tail(&lck->llist, &locks_to_send);

	}



	i = 0;

	el = locks_to_send.next;

	lock_flocks();

	cifs_for_each_lock(cfile->dentry->d_inode, before) {

		if (el == &locks_to_send) {

			/* something is really wrong */

			cERROR(1, "Can't push all brlocks!");

			break;

		}

		flock = *before;

		if ((flock->fl_flags & FL_POSIX) == 0)

			continue;

		length = 1 + flock->fl_end - flock->fl_start;

		if (flock->fl_type == F_RDLCK || flock->fl_type == F_SHLCK)

			type = CIFS_RDLCK;

		else

			type = CIFS_WRLCK;



		lck = cifs_lock_init(flock->fl_start, length, type,

				     cfile->netfid);

		if (!lck) {

			rc = -ENOMEM;

			goto send_locks;

		}

		lck = list_entry(el, struct lock_to_push, llist);

		lck->pid = flock->fl_pid;



		list_add_tail(&lck->llist, &locks_to_send);

		lck->netfid = cfile->netfid;

		lck->length = length;

		lck->type = type;

		lck->offset = flock->fl_start;

		i++;

		el = el->next;

	}



send_locks:

	unlock_flocks();



	list_for_each_entry_safe(lck, tmp, &locks_to_send, llist) {
@@ -979,11 +1015,18 @@ cifs_push_posix_locks(struct cifsFileInfo *cfile) 
		kfree(lck);

	}



out:

	cinode->can_cache_brlcks = false;

	mutex_unlock(&cinode->lock_mutex);



	FreeXid(xid);

	return rc;

err_out:

	list_for_each_entry_safe(lck, tmp, &locks_to_send, llist) {

		list_del(&lck->llist);

		kfree(lck);

	}

	goto out;

}



static int

fs/cifs/xattr.c

+3 −3
Original line number Diff line number Diff line
@@ -105,7 +105,6 @@ int cifs_setxattr(struct dentry *direntry, const char *ea_name, 
	struct cifs_tcon *pTcon;

	struct super_block *sb;

	char *full_path;

	struct cifs_ntsd *pacl;



	if (direntry == NULL)

		return -EIO;
@@ -164,23 +163,24 @@ int cifs_setxattr(struct dentry *direntry, const char *ea_name, 
			cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR);

	} else if (strncmp(ea_name, CIFS_XATTR_CIFS_ACL,

			strlen(CIFS_XATTR_CIFS_ACL)) == 0) {

#ifdef CONFIG_CIFS_ACL

		struct cifs_ntsd *pacl;

		pacl = kmalloc(value_size, GFP_KERNEL);

		if (!pacl) {

			cFYI(1, "%s: Can't allocate memory for ACL",

					__func__);

			rc = -ENOMEM;

		} else {

#ifdef CONFIG_CIFS_ACL

			memcpy(pacl, ea_value, value_size);

			rc = set_cifs_acl(pacl, value_size,

				direntry->d_inode, full_path, CIFS_ACL_DACL);

			if (rc == 0) /* force revalidate of the inode */

				CIFS_I(direntry->d_inode)->time = 0;

			kfree(pacl);

		}

#else

			cFYI(1, "Set CIFS ACL not supported yet");

#endif /* CONFIG_CIFS_ACL */

		}

	} else {

		int temp;

		temp = strncmp(ea_name, POSIX_ACL_XATTR_ACCESS,