Commit 1a33418a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag '6.15-rc5-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6 

Pull smb client fixes from Steve French:

 - Fix dentry leak which can cause umount crash

 - Add warning for parse contexts error on compounded operation

* tag '6.15-rc5-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6:
  smb: client: Avoid race in open_cached_dir with lease breaks
  smb3 client: warn when parse contexts returns error on compounded operation
parents 0e1329d4 3ca02e63

fs/smb/client/cached_dir.c

+2 −8
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ static struct cached_fid *find_or_create_cached_dir(struct cached_fids *cfids, 
{

	struct cached_fid *cfid;



	spin_lock(&cfids->cfid_list_lock);

	list_for_each_entry(cfid, &cfids->entries, entry) {

		if (!strcmp(cfid->path, path)) {

			/*
@@ -38,25 +37,20 @@ static struct cached_fid *find_or_create_cached_dir(struct cached_fids *cfids, 
			 * being deleted due to a lease break.

			 */

			if (!cfid->time || !cfid->has_lease) {

				spin_unlock(&cfids->cfid_list_lock);

				return NULL;

			}

			kref_get(&cfid->refcount);

			spin_unlock(&cfids->cfid_list_lock);

			return cfid;

		}

	}

	if (lookup_only) {

		spin_unlock(&cfids->cfid_list_lock);

		return NULL;

	}

	if (cfids->num_entries >= max_cached_dirs) {

		spin_unlock(&cfids->cfid_list_lock);

		return NULL;

	}

	cfid = init_cached_dir(path);

	if (cfid == NULL) {

		spin_unlock(&cfids->cfid_list_lock);

		return NULL;

	}

	cfid->cfids = cfids;
@@ -74,7 +68,6 @@ static struct cached_fid *find_or_create_cached_dir(struct cached_fids *cfids, 
	 */

	cfid->has_lease = true;



	spin_unlock(&cfids->cfid_list_lock);

	return cfid;

}
@@ -187,8 +180,10 @@ int open_cached_dir(unsigned int xid, struct cifs_tcon *tcon, 
	if (!utf16_path)

		return -ENOMEM;



	spin_lock(&cfids->cfid_list_lock);

	cfid = find_or_create_cached_dir(cfids, path, lookup_only, tcon->max_cached_dirs);

	if (cfid == NULL) {

		spin_unlock(&cfids->cfid_list_lock);

		kfree(utf16_path);

		return -ENOENT;

	}
@@ -197,7 +192,6 @@ int open_cached_dir(unsigned int xid, struct cifs_tcon *tcon, 
	 * Otherwise, it is either a new entry or laundromat worker removed it

	 * from @cfids->entries.  Caller will put last reference if the latter.

	 */

	spin_lock(&cfids->cfid_list_lock);

	if (cfid->has_lease && cfid->time) {

		spin_unlock(&cfids->cfid_list_lock);

		*ret_cfid = cfid;

fs/smb/client/smb2inode.c

+2 −0
Original line number Diff line number Diff line
@@ -666,6 +666,8 @@ static int smb2_compound_op(const unsigned int xid, struct cifs_tcon *tcon, 
		/* smb2_parse_contexts() fills idata->fi.IndexNumber */

		rc = smb2_parse_contexts(server, &rsp_iov[0], &oparms->fid->epoch,

					 oparms->fid->lease_key, &oplock, &idata->fi, NULL);

		if (rc)

			cifs_dbg(VFS, "rc: %d parsing context of compound op\n", rc);

	}



	for (i = 0; i < num_cmds; i++) {