Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 (929a8651) · Commits · jan.koester / Linux

fs/cifs/cifssmb.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2475,7 +2475,7 @@ CIFSSMBUnixQuerySymLink(const int xid, struct cifsTconInfo *tcon,
		/* BB FIXME investigate remapping reserved chars here */
		*symlinkinfo = cifs_strndup_from_ucs(data_start, count,
		is_unicode, nls_codepage);
		if (!symlinkinfo)
		if (!*symlinkinfo)
		rc = -ENOMEM;
		}
		}

fs/cifs/link.c

+26 −26

Original line number	Diff line number	Diff line
		@@ -107,48 +107,48 @@ void *
		cifs_follow_link(struct dentry direntry, struct nameidata nd)
		{
		struct inode *inode = direntry->d_inode;
		int rc = -EACCES;
		int rc = -ENOMEM;
		int xid;
		char *full_path = NULL;
		char *target_path = ERR_PTR(-ENOMEM);
		struct cifs_sb_info *cifs_sb;
		struct cifsTconInfo *pTcon;
		char *target_path = NULL;
		struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);
		struct cifsTconInfo *tcon = cifs_sb->tcon;

		xid = GetXid();

		full_path = build_path_from_dentry(direntry);
		/*
		* For now, we just handle symlinks with unix extensions enabled.
		* Eventually we should handle NTFS reparse points, and MacOS
		* symlink support. For instance...
		*
		* rc = CIFSSMBQueryReparseLinkInfo(...)
		*
		* For now, just return -EACCES when the server doesn't support posix
		* extensions. Note that we still allow querying symlinks when posix
		* extensions are manually disabled. We could disable these as well
		* but there doesn't seem to be any harm in allowing the client to
		* read them.
		*/
		if (!(tcon->ses->capabilities & CAP_UNIX)) {
		rc = -EACCES;
		goto out;
		}

		full_path = build_path_from_dentry(direntry);
		if (!full_path)
		goto out;

		cFYI(1, ("Full path: %s inode = 0x%p", full_path, inode));
		cifs_sb = CIFS_SB(inode->i_sb);
		pTcon = cifs_sb->tcon;

		/* We could change this to:
		if (pTcon->unix_ext)
		but there does not seem any point in refusing to
		get symlink info if we can, even if unix extensions
		turned off for this mount */

		if (pTcon->ses->capabilities & CAP_UNIX)
		rc = CIFSSMBUnixQuerySymLink(xid, pTcon, full_path,
		&target_path,
		rc = CIFSSMBUnixQuerySymLink(xid, tcon, full_path, &target_path,
		cifs_sb->local_nls);
		else {
		/* BB add read reparse point symlink code here */
		/* rc = CIFSSMBQueryReparseLinkInfo */
		/* BB Add code to Query ReparsePoint info */
		/* BB Add MAC style xsymlink check here if enabled */
		}

		kfree(full_path);
		out:
		if (rc != 0) {
		kfree(target_path);
		target_path = ERR_PTR(rc);
		}

		kfree(full_path);
		out:
		FreeXid(xid);
		nd_set_link(nd, target_path);
		return NULL;