Commit 8520eeaa 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 parsing of hostname in dfs referrals
  cifs: display fsc in /proc/mounts
  cifs: enable fscache iff fsc mount option is used explicitly
  cifs: allow fsc mount option only if CONFIG_CIFS_FSCACHE is set
  cifs: Handle extended attribute name cifs_acl to generate cifs acl blob (try #4)
  cifs: Misc. cleanup in cifsacl handling [try #4]
  cifs: trivial comment fix for cifs_invalidate_mapping
  [CIFS] fs/cifs/Kconfig: CIFS depends on CRYPTO_HMAC
  cifs: don't take extra tlink reference in initiate_cifs_search
  cifs: Percolate error up to the caller during get/set acls [try #4]
  cifs: fix another memleak, in cifs_root_iget
  cifs: fix potential use-after-free in cifs_oplock_break_put
parents fb82155d ba038648

fs/cifs/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ config CIFS 
	select NLS

	select CRYPTO

	select CRYPTO_MD5

	select CRYPTO_HMAC

	select CRYPTO_ARC4

	help

	  This is the client VFS module for the Common Internet File System
@@ -143,6 +144,13 @@ config CIFS_FSCACHE 
	    to be cached locally on disk through the general filesystem cache

	    manager. If unsure, say N.



config CIFS_ACL

	  bool "Provide CIFS ACL support (EXPERIMENTAL)"

	  depends on EXPERIMENTAL && CIFS_XATTR

	  help

	    Allows to fetch CIFS/NTFS ACL from the server.  The DACL blob

	    is handed over to the application/caller.



config CIFS_EXPERIMENTAL

	  bool "CIFS Experimental Features (EXPERIMENTAL)"

	  depends on CIFS && EXPERIMENTAL

fs/cifs/cifsacl.c

+28 −20
Original line number Diff line number Diff line
@@ -560,7 +560,7 @@ static struct cifs_ntsd *get_cifs_acl_by_fid(struct cifs_sb_info *cifs_sb, 
	struct tcon_link *tlink = cifs_sb_tlink(cifs_sb);



	if (IS_ERR(tlink))

		return NULL;

		return ERR_CAST(tlink);



	xid = GetXid();

	rc = CIFSSMBGetCIFSACL(xid, tlink_tcon(tlink), fid, &pntsd, pacllen);
@@ -568,7 +568,9 @@ static struct cifs_ntsd *get_cifs_acl_by_fid(struct cifs_sb_info *cifs_sb, 


	cifs_put_tlink(tlink);



	cFYI(1, "GetCIFSACL rc = %d ACL len %d", rc, *pacllen);

	cFYI(1, "%s: rc = %d ACL len %d", __func__, rc, *pacllen);

	if (rc)

		return ERR_PTR(rc);

	return pntsd;

}
@@ -583,7 +585,7 @@ static struct cifs_ntsd *get_cifs_acl_by_path(struct cifs_sb_info *cifs_sb, 
	struct tcon_link *tlink = cifs_sb_tlink(cifs_sb);



	if (IS_ERR(tlink))

		return NULL;

		return ERR_CAST(tlink);



	tcon = tlink_tcon(tlink);

	xid = GetXid();
@@ -591,23 +593,22 @@ static struct cifs_ntsd *get_cifs_acl_by_path(struct cifs_sb_info *cifs_sb, 
	rc = CIFSSMBOpen(xid, tcon, path, FILE_OPEN, READ_CONTROL, 0,

			 &fid, &oplock, NULL, cifs_sb->local_nls,

			 cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR);

	if (rc) {

		cERROR(1, "Unable to open file to get ACL");

		goto out;

	}



	if (!rc) {

		rc = CIFSSMBGetCIFSACL(xid, tcon, fid, &pntsd, pacllen);

	cFYI(1, "GetCIFSACL rc = %d ACL len %d", rc, *pacllen);



		CIFSSMBClose(xid, tcon, fid);

 out:

	}



	cifs_put_tlink(tlink);

	FreeXid(xid);



	cFYI(1, "%s: rc = %d ACL len %d", __func__, rc, *pacllen);

	if (rc)

		return ERR_PTR(rc);

	return pntsd;

}



/* Retrieve an ACL from the server */

static struct cifs_ntsd *get_cifs_acl(struct cifs_sb_info *cifs_sb,

struct cifs_ntsd *get_cifs_acl(struct cifs_sb_info *cifs_sb,

				      struct inode *inode, const char *path,

				      u32 *pacllen)

{
@@ -695,7 +696,7 @@ static int set_cifs_acl(struct cifs_ntsd *pnntsd, __u32 acllen, 
}



/* Translate the CIFS ACL (simlar to NTFS ACL) for a file into mode bits */

void

int

cifs_acl_to_fattr(struct cifs_sb_info *cifs_sb, struct cifs_fattr *fattr,

		  struct inode *inode, const char *path, const __u16 *pfid)

{
@@ -711,17 +712,21 @@ cifs_acl_to_fattr(struct cifs_sb_info *cifs_sb, struct cifs_fattr *fattr, 
		pntsd = get_cifs_acl(cifs_sb, inode, path, &acllen);



	/* if we can retrieve the ACL, now parse Access Control Entries, ACEs */

	if (pntsd)

	if (IS_ERR(pntsd)) {

		rc = PTR_ERR(pntsd);

		cERROR(1, "%s: error %d getting sec desc", __func__, rc);

	} else {

		rc = parse_sec_desc(pntsd, acllen, fattr);

		kfree(pntsd);

		if (rc)

		cFYI(1, "parse sec desc failed rc = %d", rc);

			cERROR(1, "parse sec desc failed rc = %d", rc);

	}



	kfree(pntsd);

	return;

	return rc;

}



/* Convert mode bits to an ACL so we can update the ACL on the server */

int mode_to_acl(struct inode *inode, const char *path, __u64 nmode)

int mode_to_cifs_acl(struct inode *inode, const char *path, __u64 nmode)

{

	int rc = 0;

	__u32 secdesclen = 0;
@@ -736,7 +741,10 @@ int mode_to_acl(struct inode *inode, const char *path, __u64 nmode) 
	/* Add three ACEs for owner, group, everyone getting rid of

	   other ACEs as chmod disables ACEs and set the security descriptor */



	if (pntsd) {

	if (IS_ERR(pntsd)) {

		rc = PTR_ERR(pntsd);

		cERROR(1, "%s: error %d getting sec desc", __func__, rc);

	} else {

		/* allocate memory for the smb header,

		   set security descriptor request security descriptor

		   parameters, and secuirty descriptor itself */

fs/cifs/cifsfs.c

+2 −0
Original line number Diff line number Diff line
@@ -458,6 +458,8 @@ cifs_show_options(struct seq_file *s, struct vfsmount *m) 
		seq_printf(s, ",acl");

	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MF_SYMLINKS)

		seq_printf(s, ",mfsymlinks");

	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_FSCACHE)

		seq_printf(s, ",fsc");



	seq_printf(s, ",rsize=%d", cifs_sb->rsize);

	seq_printf(s, ",wsize=%d", cifs_sb->wsize);

fs/cifs/cifsproto.h

+4 −2
Original line number Diff line number Diff line
@@ -130,10 +130,12 @@ extern int cifs_get_file_info_unix(struct file *filp); 
extern int cifs_get_inode_info_unix(struct inode **pinode,

			const unsigned char *search_path,

			struct super_block *sb, int xid);

extern void cifs_acl_to_fattr(struct cifs_sb_info *cifs_sb,

extern int cifs_acl_to_fattr(struct cifs_sb_info *cifs_sb,

			      struct cifs_fattr *fattr, struct inode *inode,

			      const char *path, const __u16 *pfid);

extern int mode_to_acl(struct inode *inode, const char *path, __u64);

extern int mode_to_cifs_acl(struct inode *inode, const char *path, __u64);

extern struct cifs_ntsd *get_cifs_acl(struct cifs_sb_info *, struct inode *,

					const char *, u32 *);



extern int cifs_mount(struct super_block *, struct cifs_sb_info *, char *,

			const char *);

fs/cifs/connect.c

+5 −0
Original line number Diff line number Diff line
@@ -1352,6 +1352,11 @@ cifs_parse_mount_options(char *options, const char *devname, 
				"supported. Instead set "

				"/proc/fs/cifs/LookupCacheEnabled to 0\n");

		} else if (strnicmp(data, "fsc", 3) == 0) {

#ifndef CONFIG_CIFS_FSCACHE

			cERROR(1, "FS-Cache support needs CONFIG_CIFS_FSCACHE"

				  "kernel config option set");

			return 1;

#endif

			vol->fsc = true;

		} else if (strnicmp(data, "mfsymlinks", 10) == 0) {

			vol->mfsymlinks = true;

CRA Git | Maintained and supported by SUSTech CRA and CCSE