From: Mikhail Pershin <mpershin@whamcloud.com>
Date: Thu, 31 Oct 2019 20:44:38 +0000 (+0300)
Subject: LU-12856 target: check FLFLAGS are valid while accessing them
X-Git-Tag: 2.12.4-RC1~36
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=5519429c5c4cee15d43c7483f29318899e3cf95e;p=fs%2Flustre-release.git

LU-12856 target: check FLFLAGS are valid while accessing them

While checking OBD_FL_SHORT_IO flag check first that OBD_MD_FLFLAGS
are valid.

Lustre-change: https://review.whamcloud.com/36632
Lustre-commit: 707f5a982e895c9a484dcdb8d1644e3f63c7c5cc

Signed-off-by: Mikhail Pershin <mpershin@whamcloud.com>
Change-Id: I04ac61141d70883c29a113fac3985ac81cc878af
Reviewed-by: Patrick Farrell <farr0186@gmail.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Signed-off-by: Minh Diep <mdiep@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/37000
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
---

diff --git a/lustre/target/tgt_handler.c b/lustre/target/tgt_handler.c
index 0972eac..75b5cec 100644
--- a/lustre/target/tgt_handler.c
+++ b/lustre/target/tgt_handler.c
@@ -443,7 +443,8 @@ static int tgt_handle_request0(struct tgt_session_info *tsi,
 
 			req_capsule_set_size(tsi->tsi_pill, &RMF_SHORT_IO,
 					 RCL_SERVER,
-					 (body->oa.o_flags & OBD_FL_SHORT_IO) ?
+					 (body->oa.o_valid & OBD_MD_FLFLAGS &&
+					  body->oa.o_flags & OBD_FL_SHORT_IO) ?
 					 remote_nb[0].rnb_len : 0);
 		}
 
@@ -2234,7 +2235,8 @@ int tgt_brw_read(struct tgt_session_info *tsi)
 	if (rc != 0)
 		GOTO(out_lock, rc);
 
-	if (body->oa.o_flags & OBD_FL_SHORT_IO) {
+	if (body->oa.o_valid & OBD_MD_FLFLAGS &&
+	    body->oa.o_flags & OBD_FL_SHORT_IO) {
 		desc = NULL;
 	} else {
 		desc = ptlrpc_prep_bulk_exp(req, npages, ioobj_max_brw_get(ioo),
@@ -2313,7 +2315,8 @@ int tgt_brw_read(struct tgt_session_info *tsi)
 	/* Check if client was evicted while we were doing i/o before touching
 	 * network */
 	if (rc == 0) {
-		if (body->oa.o_flags & OBD_FL_SHORT_IO) {
+		if (body->oa.o_valid & OBD_MD_FLFLAGS &&
+		    body->oa.o_flags & OBD_FL_SHORT_IO) {
 			unsigned char *short_io_buf;
 			int short_io_size;
 
@@ -2334,7 +2337,8 @@ int tgt_brw_read(struct tgt_session_info *tsi)
 		}
 		no_reply = rc != 0;
 	} else {
-		if (body->oa.o_flags & OBD_FL_SHORT_IO)
+		if (body->oa.o_valid & OBD_MD_FLFLAGS &&
+		    body->oa.o_flags & OBD_FL_SHORT_IO)
 			req_capsule_shrink(&req->rq_pill, &RMF_SHORT_IO, 0,
 					   RCL_SERVER);
 	}
@@ -2585,7 +2589,8 @@ int tgt_brw_write(struct tgt_session_info *tsi)
 			objcount, ioo, remote_nb, &npages, local_nb);
 	if (rc < 0)
 		GOTO(out_lock, rc);
-	if (body->oa.o_flags & OBD_FL_SHORT_IO) {
+	if (body->oa.o_valid & OBD_MD_FLFLAGS &&
+	    body->oa.o_flags & OBD_FL_SHORT_IO) {
 		unsigned int short_io_size;
 		unsigned char *short_io_buf;