Commit b9c7a2bb authored by Steve French's avatar Steve French
Browse files

[CIFS] ACL support part 8 



Now GetACL in getinodeinfo path when cifsacl mount option used, and
ACL is parsed for SIDs.  Missing only one piece now to be able
to retrieve the mode

Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent d61e5808

fs/cifs/cifsacl.c

+70 −63
Original line number Diff line number Diff line
@@ -155,69 +155,11 @@ static void access_flags_to_mode(__u32 ace_flags, umode_t *pmode, 
		*pmode |= (S_IXUGO & bits_to_set);



#ifdef CONFIG_CIFS_DEBUG2

	cFYI(1, ("access flags 0x%x mode now 0x%x", ace_flags, *pmode);

	cFYI(1, ("access flags 0x%x mode now 0x%x", ace_flags, *pmode));

#endif

	return;

}



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



void acl_to_uid_mode(struct inode *inode, const char *path)

{

	struct cifsFileInfo *open_file;

	int unlock_file = FALSE;

	int xid;

	int rc = -EIO;

	__u16 fid;

	struct super_block *sb;

	struct cifs_sb_info *cifs_sb;



	cFYI(1, ("get mode from ACL for %s", path));

	

	if (inode == NULL)

		return;



	xid = GetXid();

	open_file = find_readable_file(CIFS_I(inode));

	if (open_file) {

		unlock_file = TRUE;

		fid = open_file->netfid;

	} else {

		int oplock = FALSE;

		/* open file */

		sb = inode->i_sb;

		if (sb == NULL) {

			FreeXid(xid);

			return;

		}

		cifs_sb = CIFS_SB(sb);

		rc = CIFSSMBOpen(xid, cifs_sb->tcon, path, FILE_OPEN,

				GENERIC_READ, 0, &fid, &oplock, NULL,

				cifs_sb->local_nls, cifs_sb->mnt_cifs_flags &

					CIFS_MOUNT_MAP_SPECIAL_CHR);

		if (rc != 0) {

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

			FreeXid(xid);

			return;

		}

	}



	/*   rc = CIFSSMBGetCIFSACL(xid, cifs_sb->tcon, fid, pntsd, acllen,

				    ACL_TYPE_ACCESS); */



	if (unlock_file == TRUE)

		atomic_dec(&open_file->wrtPending);

	else

		CIFSSMBClose(xid, cifs_sb->tcon, fid);



/* parse ACEs e.g.

	rc = parse_sec_desc(pntsd, acllen, inode);

*/



	FreeXid(xid);

	return;

}





static void parse_ace(struct cifs_ace *pace, char *end_of_acl)

{
@@ -314,12 +256,12 @@ static void parse_dacl(struct cifs_acl *pdacl, char *end_of_acl, 


static int parse_sid(struct cifs_sid *psid, char *end_of_acl)

{



	/* BB need to add parm so we can store the SID BB */



	/* validate that we do not go past end of acl */

	if (end_of_acl < (char *)psid + sizeof(struct cifs_sid)) {

		cERROR(1, ("ACL too small to parse SID"));

	/* validate that we do not go past end of ACL - sid must be at least 8

	   bytes long (assuming no sub-auths - e.g. the null SID */

	if (end_of_acl < (char *)psid + 8) {

		cERROR(1, ("ACL too small to parse SID %p", psid));

		return -EINVAL;

	}
@@ -354,6 +296,9 @@ static int parse_sec_desc(struct cifs_ntsd *pntsd, int acl_len, 
	struct cifs_acl *dacl_ptr; /* no need for SACL ptr */

	char *end_of_acl = ((char *)pntsd) + acl_len;



	if ((inode == NULL) || (pntsd == NULL))

		return -EIO;



	owner_sid_ptr = (struct cifs_sid *)((char *)pntsd +

				le32_to_cpu(pntsd->osidoffset));

	group_sid_ptr = (struct cifs_sid *)((char *)pntsd +
@@ -368,6 +313,7 @@ static int parse_sec_desc(struct cifs_ntsd *pntsd, int acl_len, 
		 le32_to_cpu(pntsd->sacloffset),

		 le32_to_cpu(pntsd->dacloffset)));

#endif

/*	cifs_dump_mem("owner_sid: ", owner_sid_ptr, 64); */

	rc = parse_sid(owner_sid_ptr, end_of_acl);

	if (rc)

		return rc;
@@ -388,4 +334,65 @@ static int parse_sec_desc(struct cifs_ntsd *pntsd, int acl_len, 


	return (0);

}





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



void acl_to_uid_mode(struct inode *inode, const char *path)

{

	struct cifsFileInfo *open_file;

	int unlock_file = FALSE;

	int xid;

	int rc = -EIO;

	__u16 fid;

	struct super_block *sb;

	struct cifs_sb_info *cifs_sb;

	struct cifs_ntsd *pntsd = NULL;

	__u32 acllen;



	cFYI(1, ("get mode from ACL for %s", path));



	if (inode == NULL)

		return;



	xid = GetXid();

	open_file = find_readable_file(CIFS_I(inode));

	sb = inode->i_sb;

	if (sb == NULL) {

		FreeXid(xid);

		return;

	}

	cifs_sb = CIFS_SB(sb);



	if (open_file) {

		unlock_file = TRUE;

		fid = open_file->netfid;

	} else {

		int oplock = FALSE;

		/* open file */

		rc = CIFSSMBOpen(xid, cifs_sb->tcon, path, FILE_OPEN,

				GENERIC_READ, 0, &fid, &oplock, NULL,

				cifs_sb->local_nls, cifs_sb->mnt_cifs_flags &

					CIFS_MOUNT_MAP_SPECIAL_CHR);

		if (rc != 0) {

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

			FreeXid(xid);

			return;

		}

	}



	rc = CIFSSMBGetCIFSACL(xid, cifs_sb->tcon, fid, &pntsd, &acllen);

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

	if (unlock_file == TRUE)

		atomic_dec(&open_file->wrtPending);

	else

		CIFSSMBClose(xid, cifs_sb->tcon, fid);



	/* parse ACEs */

	if (!rc)

		rc = parse_sec_desc(pntsd, acllen, inode);

	kfree(pntsd);

	FreeXid(xid);

	return;

}

#endif /* CONFIG_CIFS_EXPERIMENTAL */

fs/cifs/cifssmb.c

+3 −3
Original line number Diff line number Diff line
@@ -2495,7 +2495,7 @@ CIFSSMBUnixQuerySymLink(const int xid, struct cifsTconInfo *tcon, 
	MaxSetupCount (size of returned setup area) and

	MaxParameterCount (returned parms size) must be set by caller */

static int

smb_init_ntransact(const __u16 sub_command, const int setup_count,

smb_init_nttransact(const __u16 sub_command, const int setup_count,

		   const int parm_len, struct cifsTconInfo *tcon,

		   void **ret_buf)

{
@@ -2526,7 +2526,7 @@ smb_init_ntransact(const __u16 sub_command, const int setup_count, 


static int

validate_ntransact(char *buf, char **ppparm, char **ppdata,

		   __u32 *pdatalen, __u32 *pparmlen)

		   __u32 *pparmlen, __u32 *pdatalen)

{

	char *end_of_smb;

	__u32 data_count, data_offset, parm_count, parm_offset;
@@ -3086,7 +3086,7 @@ CIFSSMBGetCIFSACL(const int xid, struct cifsTconInfo *tcon, __u16 fid, 
	*pbuflen = 0;

	*acl_inf = NULL;



	rc = smb_init_ntransact(NT_TRANSACT_QUERY_SECURITY_DESC, 0,

	rc = smb_init_nttransact(NT_TRANSACT_QUERY_SECURITY_DESC, 0,

			8 /* parm len */, tcon, (void **) &pSMB);

	if (rc)

		return rc;