OSDN Git Service

staging: lustre: fid: perform sanity checks before commiting
authorNeilBrown <neilb@suse.com>
Tue, 20 Feb 2018 02:23:38 +0000 (13:23 +1100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 22 Feb 2018 14:06:36 +0000 (15:06 +0100)
When fid fetches a new range from the server, it commits
to it (*output = *out) *before* performing sanity checks.
This looks backwards.
Don't commit to a value until it has been found to be sane.

Signed-off-by: NeilBrown <neilb@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/lustre/lustre/fid/fid_request.c

index 6e0dfe1..fa23423 100644 (file)
@@ -118,22 +118,22 @@ static int seq_client_rpc(struct lu_client_seq *seq,
                goto out_req;
 
        out = req_capsule_server_get(&req->rq_pill, &RMF_SEQ_RANGE);
-       *output = *out;
 
-       if (!lu_seq_range_is_sane(output)) {
+       if (!lu_seq_range_is_sane(out)) {
                CERROR("%s: Invalid range received from server: "
-                      DRANGE "\n", seq->lcs_name, PRANGE(output));
+                      DRANGE "\n", seq->lcs_name, PRANGE(out));
                rc = -EINVAL;
                goto out_req;
        }
 
-       if (lu_seq_range_is_exhausted(output)) {
+       if (lu_seq_range_is_exhausted(out)) {
                CERROR("%s: Range received from server is exhausted: "
-                      DRANGE "]\n", seq->lcs_name, PRANGE(output));
+                      DRANGE "]\n", seq->lcs_name, PRANGE(out));
                rc = -EINVAL;
                goto out_req;
        }
 
+       *output = *out;
        CDEBUG_LIMIT(debug_mask, "%s: Allocated %s-sequence " DRANGE "]\n",
                     seq->lcs_name, opcname, PRANGE(output));