X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmdd%2Fmdd_permission.c;h=68ebb7ad9056df2b2f844ee29b00b08cd0cb3128;hb=2104ed0f0da3651f0cb4ab0c78a1037891d7cb4f;hp=2471c0ca7e8306001bb7678081e9ada9a433058f;hpb=3fc039a99f41725798d157a422174005a49200c8;p=fs%2Flustre-release.git

diff --git a/lustre/mdd/mdd_permission.c b/lustre/mdd/mdd_permission.c
index 2471c0c..68ebb7a 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, 2013, Intel Corporation.
+ * Copyright (c) 2012, 2015, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -69,7 +69,7 @@ int mdd_acl_chmod(const struct lu_env *env, struct mdd_object *o, __u32 mode,
 	buf = mdd_buf_get(env, mdd_env_info(env)->mti_xattr_buf,
 			  sizeof(mdd_env_info(env)->mti_xattr_buf));
 
-	rc = mdo_xattr_get(env, o, buf, XATTR_NAME_ACL_ACCESS, BYPASS_CAPA);
+	rc = mdo_xattr_get(env, o, buf, XATTR_NAME_ACL_ACCESS);
 	if ((rc == -EOPNOTSUPP) || (rc == -ENODATA))
 		RETURN(0);
 	else if (rc <= 0)
@@ -88,7 +88,7 @@ int mdd_acl_chmod(const struct lu_env *env, struct mdd_object *o, __u32 mode,
 		RETURN(rc);
 
 	rc = mdo_xattr_set(env, o, buf, XATTR_NAME_ACL_ACCESS,
-			   0, handle, BYPASS_CAPA);
+			   0, handle);
 	RETURN(rc);
 }
 
@@ -99,9 +99,10 @@ int mdd_acl_set(const struct lu_env *env, struct mdd_object *obj,
 	struct thandle		*handle;
 	posix_acl_xattr_header	*head;
 	posix_acl_xattr_entry	*entry;
-	int			 rc, entry_count;
+	int			 entry_count;
 	bool			 not_equiv, mode_change;
 	mode_t			 mode;
+	int			 rc;
 	ENTRY;
 
 	head = (posix_acl_xattr_header *)(buf->lb_buf);
@@ -148,16 +149,14 @@ int mdd_acl_set(const struct lu_env *env, struct mdd_object *obj,
 	/* whether ACL can be represented by i_mode only */
 	if (not_equiv)
 		rc = mdo_xattr_set(env, obj, buf, XATTR_NAME_ACL_ACCESS, fl,
-				handle, mdd_object_capa(env, obj));
+				   handle);
 	else
-		rc = mdo_xattr_del(env, obj, XATTR_NAME_ACL_ACCESS, handle,
-				mdd_object_capa(env, obj));
+		rc = mdo_xattr_del(env, obj, XATTR_NAME_ACL_ACCESS, handle);
 	if (rc)
 		GOTO(unlock, rc);
 
 	if (mode_change)
-		rc = mdo_attr_set(env, obj, la, handle,
-				mdd_object_capa(env, obj));
+		rc = mdo_attr_set(env, obj, la, handle);
 
 	/* security-replated changes may require sync */
 	if (S_ISDIR(mdd_object_type(obj)))
@@ -165,7 +164,7 @@ int mdd_acl_set(const struct lu_env *env, struct mdd_object *obj,
 unlock:
 	mdd_write_unlock(env, obj);
 stop:
-	mdd_trans_stop(env, mdd, rc, handle);
+	rc = mdd_trans_stop(env, mdd, rc, handle);
 
 	RETURN(rc);
 }
@@ -208,44 +207,47 @@ static int mdd_check_acl(const struct lu_env *env, struct mdd_object *obj,
 {
 #ifdef CONFIG_FS_POSIX_ACL
 	struct lu_ucred  *uc  = lu_ucred_assert(env);
-        posix_acl_xattr_header *head;
-        posix_acl_xattr_entry *entry;
-        struct lu_buf   *buf;
-        int entry_count;
-        int rc;
-        ENTRY;
-
-        buf = mdd_buf_get(env, mdd_env_info(env)->mti_xattr_buf,
-                          sizeof(mdd_env_info(env)->mti_xattr_buf));
-        rc = mdo_xattr_get(env, obj, buf, XATTR_NAME_ACL_ACCESS,
-                           mdd_object_capa(env, obj));
-        if (rc <= 0)
-                RETURN(rc ? : -EACCES);
-
-        buf->lb_len = 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);
-
-        rc = lustre_posix_acl_permission(uc, la, mask, entry, entry_count);
-        RETURN(rc);
+	posix_acl_xattr_header *head;
+	posix_acl_xattr_entry *entry;
+	struct lu_buf   *buf;
+	int entry_count;
+	int rc;
+	ENTRY;
+
+	buf = mdd_buf_get(env, mdd_env_info(env)->mti_xattr_buf,
+			  sizeof(mdd_env_info(env)->mti_xattr_buf));
+	rc = mdo_xattr_get(env, obj, buf, XATTR_NAME_ACL_ACCESS);
+	if (rc <= 0)
+		RETURN(rc ? : -EACCES);
+
+	buf->lb_len = rc;
+	head = (posix_acl_xattr_header *)(buf->lb_buf);
+	entry = head->a_entries;
+	entry_count = posix_acl_xattr_count(buf->lb_len);
+
+	/* Disregard empty ACLs and fall back to
+	 * standard UNIX permissions. See LU-5434 */
+	if (entry_count <= 0)
+		RETURN(-EAGAIN);
+
+	rc = lustre_posix_acl_permission(uc, la, mask, entry, entry_count);
+	RETURN(rc);
 #else
-        ENTRY;
-        RETURN(-EAGAIN);
+	ENTRY;
+	RETURN(-EAGAIN);
 #endif
 }
 
 int __mdd_permission_internal(const struct lu_env *env, struct mdd_object *obj,
-				const 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;
-        int rc;
-        ENTRY;
+	__u32 mode;
+	int rc;
+	ENTRY;
 
-        if (mask == 0)
-                RETURN(0);
+	if (mask == 0)
+		RETURN(0);
 
 	/* These means unnecessary for permission check */
 	if ((uc == NULL) || (uc->uc_valid == UCRED_INIT))
@@ -255,15 +257,15 @@ int __mdd_permission_internal(const struct lu_env *env, struct mdd_object *obj,
 	if (uc->uc_valid == UCRED_INVALID)
 		RETURN(-EACCES);
 
-        /*
-         * Nobody gets write access to an immutable file.
-         */
-        if ((mask & MAY_WRITE) && mdd_is_immutable(obj))
-                RETURN(-EACCES);
+	/*
+	 * Nobody gets write access to an immutable file.
+	 */
+	if (mask & MAY_WRITE && la->la_flags & LUSTRE_IMMUTABLE_FL)
+		RETURN(-EACCES);
 
 	LASSERT(la != NULL);
 
-        mode = la->la_mode;
+	mode = la->la_mode;
 	if (uc->uc_fsuid == la->la_uid) {
 		mode >>= 6;
         } else {
@@ -297,6 +299,9 @@ check_capabilities:
 		if (md_capable(uc, CFS_CAP_DAC_READ_SEARCH))
 			RETURN(0);
 
+	CDEBUG(D_SEC, "permission denied, mode %x, fsuid %u, uid %u\n",
+	       la->la_mode, uc->uc_fsuid, la->la_uid);
+
 	RETURN(-EACCES);
 }
 
@@ -309,12 +314,6 @@ int mdd_permission(const struct lu_env *env,
 	struct lu_ucred *uc = NULL;
 	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;
 
@@ -322,13 +321,13 @@ int mdd_permission(const struct lu_env *env,
 	if (pobj != NULL) {
 		mdd_pobj = md2mdd_obj(pobj);
 		pattr = MDD_ENV_VAR(env, pattr);
-		rc = mdd_la_get(env, mdd_pobj, pattr, BYPASS_CAPA);
+		rc = mdd_la_get(env, mdd_pobj, pattr);
 		if (rc)
 			RETURN(rc);
 	}
 
 	mdd_cobj = md2mdd_obj(cobj);
-	rc = mdd_la_get(env, mdd_cobj, cattr, BYPASS_CAPA);
+	rc = mdd_la_get(env, mdd_cobj, cattr);
 	if (rc)
 		RETURN(rc);
 
@@ -338,77 +337,18 @@ int mdd_permission(const struct lu_env *env,
 	if (unlikely(mask & MDS_OPEN_CROSS))
 		mask = accmode(env, cattr, mask & ~MDS_OPEN_CROSS);
 
-	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;
-        check_vtx_part = mask & MAY_VTX_PART;
-        check_vtx_full = mask & MAY_VTX_FULL;
-        check_rgetfacl = mask & MAY_RGETFACL;
-
-        mask &= ~(MAY_CREATE | MAY_LINK |
-                MAY_UNLINK |
-                MAY_RENAME_SRC | MAY_RENAME_TAR |
-                MAY_VTX_PART | MAY_VTX_FULL |
-                MAY_RGETFACL);
-
-	rc = mdd_permission_internal_locked(env, mdd_cobj, cattr, mask,
-					MOR_TGT_CHILD);
-
-	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_pobj, pattr, cattr);
-
-	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 (!(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;
-                } else {
-                        ma->ma_attr_flags &= ~MDS_VTX_BYPASS;
-                        if (check_vtx_full)
-                                rc = -EPERM;
-                }
-        }
+	rc = mdd_permission_internal_locked(env, mdd_cobj, cattr,
+					    mask & ~MAY_RGETFACL,
+					    MOR_TGT_CHILD);
 
-        if (unlikely(!rc && check_rgetfacl)) {
-                if (likely(!uc))
+	if (unlikely(rc == 0 && (mask & MAY_RGETFACL))) {
+		if (likely(!uc))
 			uc = lu_ucred_assert(env);
 
 		if (cattr->la_uid != uc->uc_fsuid &&
 		    !md_capable(uc, CFS_CAP_FOWNER))
 			rc = -EPERM;
-        }
-
-        RETURN(rc);
-}
-
-int mdd_capa_get(const struct lu_env *env, struct md_object *obj,
-                 struct lustre_capa *capa, int renewal)
-{
-        struct mdd_object *mdd_obj = md2mdd_obj(obj);
-        struct obd_capa *oc;
-        int rc = 0;
-        ENTRY;
-
-        oc = mdo_capa_get(env, mdd_obj, renewal ? capa : NULL,
-                          capa->lc_opc);
-        if (IS_ERR(oc)) {
-                rc = PTR_ERR(oc);
-        } else if (likely(oc != NULL)) {
-                capa_cpy(capa, oc);
-                capa_put(oc);
-        }
+	}
 
-        RETURN(rc);
+	RETURN(rc);
 }