Commit 23fc2702 authored by Tiger Yang's avatar Tiger Yang Committed by Mark Fasheh
Browse files

ocfs2: add ocfs2_check_acl 



This function is used to enhance permission checking with POSIX ACLs.

Signed-off-by: default avatarTiger Yang <tiger.yang@oracle.com>
Signed-off-by: default avatarMark Fasheh <mfasheh@suse.com>
parent 929fb014

fs/ocfs2/acl.c

+15 −0
Original line number Diff line number Diff line
@@ -230,6 +230,21 @@ static int ocfs2_set_acl(handle_t *handle, 
	return ret;

}



int ocfs2_check_acl(struct inode *inode, int mask)

{

	struct posix_acl *acl = ocfs2_get_acl(inode, ACL_TYPE_ACCESS);



	if (IS_ERR(acl))

		return PTR_ERR(acl);

	if (acl) {

		int ret = posix_acl_permission(inode, acl, mask);

		posix_acl_release(acl);

		return ret;

	}



	return -EAGAIN;

}



static size_t ocfs2_xattr_list_acl_access(struct inode *inode,

					  char *list,

					  size_t list_len,

fs/ocfs2/acl.h

+10 −0
Original line number Diff line number Diff line
@@ -26,4 +26,14 @@ struct ocfs2_acl_entry { 
	__le32 e_id;

};



#ifdef CONFIG_OCFS2_FS_POSIX_ACL



extern int ocfs2_check_acl(struct inode *, int);



#else /* CONFIG_OCFS2_FS_POSIX_ACL*/



#define ocfs2_check_acl NULL



#endif /* CONFIG_OCFS2_FS_POSIX_ACL*/



#endif /* OCFS2_ACL_H */

fs/ocfs2/file.c

+2 −1
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ 
#include "suballoc.h"

#include "super.h"

#include "xattr.h"

#include "acl.h"



#include "buffer_head_io.h"
@@ -1035,7 +1036,7 @@ int ocfs2_permission(struct inode *inode, int mask) 
		goto out;

	}



	ret = generic_permission(inode, mask, NULL);

	ret = generic_permission(inode, mask, ocfs2_check_acl);



	ocfs2_inode_unlock(inode, 0);

out: