* GPL HEADER END
*/
/*
- * Copyright (c) 2012, 2013, Intel Corporation.
- * Use is subject to license terms.
* Copyright (c) 2011, 2012 Commissariat a l'energie atomique et aux energies
* alternatives
+ *
+ * Copyright (c) 2012, 2014, Intel Corporation.
+ * Use is subject to license terms.
*/
/*
* lustre/mdt/mdt_hsm.c
/* pack HSM attributes */
lustre_hsm2buf(info->mti_xattr_buf, mh);
- /* update SOM attributes */
+ /* update HSM attributes */
buf->lb_buf = attrs;
buf->lb_len = sizeof(*attrs);
rc = mo_xattr_set(info->mti_env, next, buf, XATTR_NAME_HSM, 0);
if (rc)
GOTO(out_unlock, rc);
- if (req_capsule_get_size(info->mti_pill, &RMF_CAPA1, RCL_CLIENT))
- mdt_set_capainfo(info, 0, &info->mti_body->fid1,
- req_capsule_client_get(info->mti_pill,
- &RMF_CAPA1));
-
hus = req_capsule_server_get(tsi->tsi_pill, &RMF_HSM_USER_STATE);
if (hus == NULL)
GOTO(out_unlock, rc = -EPROTO);
if (rc < 0)
GOTO(out_ucred, rc);
- if (req_capsule_get_size(info->mti_pill, &RMF_CAPA1, RCL_CLIENT))
- mdt_set_capainfo(info, 0, &info->mti_body->fid1,
- req_capsule_client_get(info->mti_pill, &RMF_CAPA1));
+ /* Detect out-of range masks */
+ if ((hss->hss_setmask | hss->hss_clearmask) & ~HSM_FLAGS_MASK) {
+ CDEBUG(D_HSM, "Incompatible masks provided (set "LPX64
+ ", clear "LPX64") vs supported set (%#x).\n",
+ hss->hss_setmask, hss->hss_clearmask, HSM_FLAGS_MASK);
+ GOTO(out_unlock, rc = -EINVAL);
+ }
/* Non-root users are forbidden to set or clear flags which are
* NOT defined in HSM_USER_MASK. */
if (((hss->hss_setmask | hss->hss_clearmask) & ~HSM_USER_MASK) &&
- !md_capable(mdt_ucred(info), CFS_CAP_SYS_ADMIN))
+ !md_capable(mdt_ucred(info), CFS_CAP_SYS_ADMIN)) {
+ CDEBUG(D_HSM, "Incompatible masks provided (set "LPX64
+ ", clear "LPX64") vs unprivileged set (%#x).\n",
+ hss->hss_setmask, hss->hss_clearmask, HSM_USER_MASK);
GOTO(out_unlock, rc = -EPERM);
+ }
/* Read current HSM info */
ma->ma_valid = 0;
if (!(ma->ma_hsm.mh_flags & HS_EXISTS)) {
CDEBUG(D_HSM, "Could not set an archive number for "
DFID "if HSM EXISTS flag is not set.\n",
- PFID(&info->mti_body->fid1));
+ PFID(&info->mti_body->mbo_fid1));
GOTO(out_unlock, rc);
}
+
+ /* Detect out-of range archive id */
+ if (hss->hss_archive_id > LL_HSM_MAX_ARCHIVE) {
+ CDEBUG(D_HSM, "archive id %u exceeds maximum %zu.\n",
+ hss->hss_archive_id, LL_HSM_MAX_ARCHIVE);
+ GOTO(out_unlock, rc = -EINVAL);
+ }
+
ma->ma_hsm.mh_arch_id = hss->hss_archive_id;
}
(flags & HS_LOST && !(flags & HS_ARCHIVED))) {
CDEBUG(D_HSM, "Incompatible flag change on "DFID
"flags="LPX64"\n",
- PFID(&info->mti_body->fid1), flags);
- GOTO(out_ucred, rc = -EINVAL);
+ PFID(&info->mti_body->mbo_fid1), flags);
+ GOTO(out_unlock, rc = -EINVAL);
}
/* Save the modified flags */
if (rc)
GOTO(out, rc = err_serious(rc));
- if (req_capsule_get_size(tsi->tsi_pill, &RMF_CAPA1, RCL_CLIENT))
- mdt_set_capainfo(info, 0, &info->mti_body->fid1,
- req_capsule_client_get(info->mti_pill,
- &RMF_CAPA1));
-
/* Coordinator information */
hal_size = sizeof(*hal) +
cfs_size_round(MTI_NAME_MAXLEN) /* fsname */ +
hai->hai_action = HSMA_NONE;
hai->hai_cookie = 0;
hai->hai_gid = 0;
- hai->hai_fid = info->mti_body->fid1;
+ hai->hai_fid = info->mti_body->mbo_fid1;
hai->hai_len = sizeof(*hai);
rc = mdt_hsm_get_actions(info, hal);