Commit 01de911e authored by Oleg Drokin's avatar Oleg Drokin Committed by Greg Kroah-Hartman

staging/lustre/obdecho: Better handle invalid create requests

When gettng an invalid create request in echo code (wrong group,
or no group at all), just return an error instead of crashing.
Signed-off-by: default avatarOleg Drokin <green@linuxhacker.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 61ece0e6
...@@ -1210,8 +1210,10 @@ static int echo_create_object(const struct lu_env *env, struct echo_device *ed, ...@@ -1210,8 +1210,10 @@ static int echo_create_object(const struct lu_env *env, struct echo_device *ed,
int rc; int rc;
int created = 0; int created = 0;
if ((oa->o_valid & OBD_MD_FLID) == 0) { /* no obj id */ if (!(oa->o_valid & OBD_MD_FLID) ||
CERROR("No valid oid\n"); !(oa->o_valid & OBD_MD_FLGROUP) ||
!fid_seq_is_echo(ostid_seq(&oa->o_oi))) {
CERROR("invalid oid " DOSTID "\n", POSTID(&oa->o_oi));
return -EINVAL; return -EINVAL;
} }
...@@ -1222,16 +1224,11 @@ static int echo_create_object(const struct lu_env *env, struct echo_device *ed, ...@@ -1222,16 +1224,11 @@ static int echo_create_object(const struct lu_env *env, struct echo_device *ed,
} }
/* setup object ID here */ /* setup object ID here */
LASSERT(oa->o_valid & OBD_MD_FLGROUP);
lsm->lsm_oi = oa->o_oi; lsm->lsm_oi = oa->o_oi;
if (ostid_id(&lsm->lsm_oi) == 0) if (ostid_id(&lsm->lsm_oi) == 0)
ostid_set_id(&lsm->lsm_oi, ++last_object_id); ostid_set_id(&lsm->lsm_oi, ++last_object_id);
/* Only echo objects are allowed to be created */
LASSERT((oa->o_valid & OBD_MD_FLGROUP) &&
(ostid_seq(&oa->o_oi) == FID_SEQ_ECHO));
rc = obd_create(env, ec->ec_exp, oa, &lsm, oti); rc = obd_create(env, ec->ec_exp, oa, &lsm, oti);
if (rc != 0) { if (rc != 0) {
CERROR("Cannot create objects: rc = %d\n", rc); CERROR("Cannot create objects: rc = %d\n", rc);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment