X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre%2Fmdd%2Fmdd_permission.c;h=2471c0ca7e8306001bb7678081e9ada9a433058f;hb=41b9a48c344fb0822b2c956162b5d262f267b3a1;hp=1debe3255129c477d229e0a49a1c225c3c95ae5b;hpb=08aa217ce49aba1ded52e0f7adb8a607035123fd;p=fs%2Flustre-release.git diff --git a/lustre/mdd/mdd_permission.c b/lustre/mdd/mdd_permission.c index 1debe32..2471c0c 100644 --- a/lustre/mdd/mdd_permission.c +++ b/lustre/mdd/mdd_permission.c @@ -27,7 +27,7 @@ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2012, Intel Corporation. + * Copyright (c) 2012, 2013, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -47,7 +47,7 @@ #include #include #include - +#include #include "mdd_internal.h" #ifdef CONFIG_FS_POSIX_ACL @@ -93,10 +93,9 @@ int mdd_acl_chmod(const struct lu_env *env, struct mdd_object *o, __u32 mode, } int mdd_acl_set(const struct lu_env *env, struct mdd_object *obj, - const struct lu_buf *buf, int fl) + struct lu_attr *la, const struct lu_buf *buf, int fl) { struct mdd_device *mdd = mdd_obj2mdd_dev(obj); - struct lu_attr *la = &mdd_env_info(env)->mti_la; struct thandle *handle; posix_acl_xattr_header *head; posix_acl_xattr_entry *entry; @@ -105,10 +104,6 @@ int mdd_acl_set(const struct lu_env *env, struct mdd_object *obj, mode_t mode; ENTRY; - rc = mdd_la_get(env, obj, la, BYPASS_CAPA); - if (rc) - RETURN(rc); - head = (posix_acl_xattr_header *)(buf->lb_buf); entry = head->a_entries; entry_count = (buf->lb_len - sizeof(head->a_version)) / @@ -141,6 +136,7 @@ int mdd_acl_set(const struct lu_env *env, struct mdd_object *obj, if (mode_change) { la->la_mode = mode; + la->la_valid = LA_MODE; rc = mdo_declare_attr_set(env, obj, la, handle); } @@ -164,7 +160,8 @@ int mdd_acl_set(const struct lu_env *env, struct mdd_object *obj, mdd_object_capa(env, obj)); /* security-replated changes may require sync */ - handle->th_sync |= !!mdd->mdd_sync_permission; + if (S_ISDIR(mdd_object_type(obj))) + handle->th_sync |= !!mdd->mdd_sync_permission; unlock: mdd_write_unlock(env, obj); stop: @@ -173,64 +170,41 @@ stop: RETURN(rc); } -/* - * Hold write_lock for obj. - */ -int __mdd_acl_init(const struct lu_env *env, struct mdd_object *obj, - struct lu_buf *buf, __u32 *mode, struct thandle *handle) +/** + * Fix mode and ACL according to the default ACL(buf) + * \retval = 0 ACL does not need to be reset. + * \retval = 1 ACL needs to be reset. + * \retval < 0 error. + **/ +int __mdd_fix_mode_acl(const struct lu_env *env, struct lu_buf *buf, + __u32 *mode) { - posix_acl_xattr_header *head; - posix_acl_xattr_entry *entry; - int entry_count; - __u32 old = *mode; - int rc, rc2; - - ENTRY; + posix_acl_xattr_header *head; + posix_acl_xattr_entry *entry; + int entry_count; + int rc; - head = (posix_acl_xattr_header *)(buf->lb_buf); - entry = head->a_entries; - entry_count = (buf->lb_len - sizeof(head->a_version)) / - sizeof(posix_acl_xattr_entry); - if (entry_count <= 0) - RETURN(0); + ENTRY; - if (S_ISDIR(*mode)) { - rc = mdo_xattr_set(env, obj, buf, XATTR_NAME_ACL_DEFAULT, 0, - handle, BYPASS_CAPA); - if (rc) - RETURN(rc); - } + head = (posix_acl_xattr_header *)(buf->lb_buf); + entry = head->a_entries; + entry_count = (buf->lb_len - sizeof(head->a_version)) / + sizeof(posix_acl_xattr_entry); + if (entry_count <= 0) + RETURN(0); - rc = lustre_posix_acl_create_masq(entry, mode, entry_count); - if (rc < 0) - RETURN(rc); - - /* part of ACL went into i_mode */ - if (*mode != old) { - struct mdd_thread_info *info = mdd_env_info(env); - struct lu_attr *pattr = &info->mti_pattr; - - /* mode was initialized within object creation, - * so we need explict ->attr_set() to update it */ - pattr->la_valid = LA_MODE; - pattr->la_mode = *mode; - rc2 = mdo_attr_set(env, obj, pattr, handle, BYPASS_CAPA); - if (rc2 < 0) - rc = rc2; - } + rc = lustre_posix_acl_create_masq(entry, mode, entry_count); - if (rc > 0) - rc = mdo_xattr_set(env, obj, buf, XATTR_NAME_ACL_ACCESS, 0, - handle, BYPASS_CAPA); RETURN(rc); } + #endif /* * Hold read_lock for obj. */ static int mdd_check_acl(const struct lu_env *env, struct mdd_object *obj, - struct lu_attr *la, int mask) + const struct lu_attr *la, int mask) { #ifdef CONFIG_FS_POSIX_ACL struct lu_ucred *uc = lu_ucred_assert(env); @@ -263,7 +237,7 @@ static int mdd_check_acl(const struct lu_env *env, struct mdd_object *obj, } int __mdd_permission_internal(const struct lu_env *env, struct mdd_object *obj, - struct lu_attr *la, int mask, int role) + const struct lu_attr *la, int mask, int role) { struct lu_ucred *uc = lu_ucred(env); __u32 mode; @@ -287,12 +261,7 @@ int __mdd_permission_internal(const struct lu_env *env, struct mdd_object *obj, if ((mask & MAY_WRITE) && mdd_is_immutable(obj)) RETURN(-EACCES); - if (la == NULL) { - la = &mdd_env_info(env)->mti_la; - rc = mdd_la_get(env, obj, la, BYPASS_CAPA); - if (rc) - RETURN(rc); - } + LASSERT(la != NULL); mode = la->la_mode; if (uc->uc_fsuid == la->la_uid) { @@ -318,49 +287,59 @@ int __mdd_permission_internal(const struct lu_env *env, struct mdd_object *obj, RETURN(0); check_capabilities: - if (!(mask & MAY_EXEC) || - (la->la_mode & S_IXUGO) || S_ISDIR(la->la_mode)) - if (mdd_capable(uc, CFS_CAP_DAC_OVERRIDE)) - RETURN(0); + if (!(mask & MAY_EXEC) || + (la->la_mode & S_IXUGO) || S_ISDIR(la->la_mode)) + if (md_capable(uc, CFS_CAP_DAC_OVERRIDE)) + RETURN(0); - if ((mask == MAY_READ) || - (S_ISDIR(la->la_mode) && !(mask & MAY_WRITE))) - if (mdd_capable(uc, CFS_CAP_DAC_READ_SEARCH)) - RETURN(0); + if ((mask == MAY_READ) || + (S_ISDIR(la->la_mode) && !(mask & MAY_WRITE))) + if (md_capable(uc, CFS_CAP_DAC_READ_SEARCH)) + RETURN(0); - RETURN(-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) { - struct mdd_object *mdd_pobj, *mdd_cobj; + struct mdd_object *mdd_pobj = NULL; + struct mdd_object *mdd_cobj; struct lu_ucred *uc = NULL; - struct lu_attr *la = &mdd_env_info(env)->mti_cattr; - int check_create, check_link; - int check_unlink; - int check_rename_src, check_rename_tar; - int check_vtx_part, check_vtx_full; - int check_rgetfacl; - int rc = 0; - ENTRY; + struct lu_attr *pattr = NULL; + struct lu_attr *cattr = MDD_ENV_VAR(env, cattr); + bool check_create; + bool check_link; + int check_unlink; + int check_rename_src, check_rename_tar; + int check_vtx_part, check_vtx_full; + int check_rgetfacl; + int rc = 0; + ENTRY; - LASSERT(cobj); - mdd_cobj = md2mdd_obj(cobj); + LASSERT(cobj); + if (pobj != NULL) { + mdd_pobj = md2mdd_obj(pobj); + pattr = MDD_ENV_VAR(env, pattr); + rc = mdd_la_get(env, mdd_pobj, pattr, BYPASS_CAPA); + if (rc) + RETURN(rc); + } - rc = mdd_la_get(env, mdd_cobj, la, BYPASS_CAPA); + mdd_cobj = md2mdd_obj(cobj); + rc = mdd_la_get(env, mdd_cobj, cattr, BYPASS_CAPA); 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_*. */ + /* 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, la, mask & ~MDS_OPEN_CROSS); + mask = accmode(env, cattr, mask & ~MDS_OPEN_CROSS); - check_create = mask & MAY_CREATE; - check_link = mask & MAY_LINK; + check_create = mask & MAY_CREATE; + check_link = mask & MAY_LINK; check_unlink = mask & MAY_UNLINK; check_rename_src = mask & MAY_RENAME_SRC; check_rename_tar = mask & MAY_RENAME_TAR; @@ -374,32 +353,24 @@ int mdd_permission(const struct lu_env *env, MAY_VTX_PART | MAY_VTX_FULL | MAY_RGETFACL); - rc = mdd_permission_internal_locked(env, mdd_cobj, NULL, mask, - MOR_TGT_CHILD); + rc = mdd_permission_internal_locked(env, mdd_cobj, cattr, mask, + MOR_TGT_CHILD); - if (!rc && (check_create || check_link)) - rc = mdd_may_create(env, mdd_cobj, NULL, 1, check_link); + if (!rc && check_create) + rc = mdd_may_create(env, mdd_pobj, pattr, mdd_cobj, true); if (!rc && check_unlink) - rc = mdd_may_unlink(env, mdd_cobj, la); + rc = mdd_may_unlink(env, mdd_pobj, pattr, cattr); - if (!rc && (check_rename_src || check_rename_tar)) { - LASSERT(pobj); - mdd_pobj = md2mdd_obj(pobj); - rc = mdd_may_delete(env, mdd_pobj, mdd_cobj, la, NULL, 1, - check_rename_tar); - } + if (!rc && (check_rename_src || check_rename_tar)) + rc = mdd_may_delete(env, mdd_pobj, pattr, mdd_cobj, cattr, NULL, + 1, check_rename_tar); if (!rc && (check_vtx_part || check_vtx_full)) { uc = lu_ucred_assert(env); - if (likely(!la)) { - la = &mdd_env_info(env)->mti_la; - rc = mdd_la_get(env, mdd_cobj, la, BYPASS_CAPA); - if (rc) - RETURN(rc); - } - if (!(la->la_mode & S_ISVTX) || (la->la_uid == uc->uc_fsuid) || + if (!(cattr->la_mode & S_ISVTX) || + (cattr->la_uid == uc->uc_fsuid) || (check_vtx_full && (ma->ma_attr.la_valid & LA_UID) && (ma->ma_attr.la_uid == uc->uc_fsuid))) { ma->ma_attr_flags |= MDS_VTX_BYPASS; @@ -414,8 +385,8 @@ int mdd_permission(const struct lu_env *env, if (likely(!uc)) uc = lu_ucred_assert(env); - if (la->la_uid != uc->uc_fsuid && - !mdd_capable(uc, CFS_CAP_FOWNER)) + if (cattr->la_uid != uc->uc_fsuid && + !md_capable(uc, CFS_CAP_FOWNER)) rc = -EPERM; }