#include <lustre_idmap.h>
#include "mdd_internal.h"
-#ifdef CONFIG_FS_POSIX_ACL
+#ifdef CONFIG_LUSTRE_FS_POSIX_ACL
/*
* Hold write_lock for o.
ENTRY;
lu_buf_check_and_alloc(&mdd_env_info(env)->mti_xattr_buf,
- mdd_obj2mdd_dev(o)->mdd_dt_conf.ddp_max_ea_size);
+ min_t(unsigned int,
+ mdd_obj2mdd_dev(o)->mdd_dt_conf.ddp_max_ea_size,
+ XATTR_SIZE_MAX));
buf = mdd_env_info(env)->mti_xattr_buf;
+ if (buf.lb_buf == NULL)
+ RETURN(-ENOMEM);
+
+ if (buf.lb_len > XATTR_SIZE_MAX)
+ buf.lb_len = XATTR_SIZE_MAX;
+
rc = mdo_xattr_get(env, o, &buf, XATTR_NAME_ACL_ACCESS);
if ((rc == -EOPNOTSUPP) || (rc == -ENODATA))
RETURN(0);
if (rc)
GOTO(stop, rc);
- mdd_write_lock(env, obj, MOR_TGT_CHILD);
+ mdd_write_lock(env, obj, DT_TGT_CHILD);
/* whether ACL can be represented by i_mode only */
if (not_equiv)
rc = mdo_xattr_set(env, obj, buf, XATTR_NAME_ACL_ACCESS, fl,
static int mdd_check_acl(const struct lu_env *env, struct mdd_object *obj,
const struct lu_attr *la, int mask)
{
-#ifdef CONFIG_FS_POSIX_ACL
+#ifdef CONFIG_LUSTRE_FS_POSIX_ACL
struct lu_ucred *uc = lu_ucred_assert(env);
posix_acl_xattr_header *head;
posix_acl_xattr_entry *entry;
ENTRY;
lu_buf_check_and_alloc(&mdd_env_info(env)->mti_xattr_buf,
- mdd_obj2mdd_dev(obj)->mdd_dt_conf.ddp_max_ea_size);
+ min_t(unsigned int,
+ mdd_obj2mdd_dev(obj)->mdd_dt_conf.ddp_max_ea_size,
+ XATTR_SIZE_MAX));
buf = mdd_env_info(env)->mti_xattr_buf;
+ if (buf.lb_buf == NULL)
+ RETURN(-ENOMEM);
+
+ if (buf.lb_len > XATTR_SIZE_MAX)
+ buf.lb_len = XATTR_SIZE_MAX;
+
rc = mdo_xattr_get(env, obj, &buf, XATTR_NAME_ACL_ACCESS);
if (rc <= 0)
RETURN(rc ? : -EACCES);
RETURN(-EACCES);
}
-int mdd_permission(const struct lu_env *env,
- struct md_object *pobj, struct md_object *cobj,
- struct md_attr *ma, int mask)
+int mdd_permission(const struct lu_env *env, struct md_object *pobj,
+ struct md_object *cobj, struct md_attr *ma, int mask)
{
struct mdd_object *mdd_pobj = NULL;
struct mdd_object *mdd_cobj;
if (rc)
RETURN(rc);
- /* For cross_open case, the "mask" is open flags,
- * so convert it to permission mask first.
- * XXX: MDS_OPEN_CROSS must be NOT equal to permission mask MAY_*. */
- if (unlikely(mask & MDS_OPEN_CROSS))
- mask = accmode(env, cattr, mask & ~MDS_OPEN_CROSS);
-
rc = mdd_permission_internal_locked(env, mdd_cobj, cattr,
mask & ~MAY_RGETFACL,
- MOR_TGT_CHILD);
+ DT_TGT_CHILD);
if (unlikely(rc == 0 && (mask & MAY_RGETFACL))) {
if (likely(!uc))