@@ -395,12 +395,6 @@ int io_sendmsg_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
395
395
396
396
sr -> done_io = 0 ;
397
397
sr -> retry = false;
398
-
399
- if (req -> opcode != IORING_OP_SEND ) {
400
- if (sqe -> addr2 || sqe -> file_index )
401
- return - EINVAL ;
402
- }
403
-
404
398
sr -> len = READ_ONCE (sqe -> len );
405
399
sr -> flags = READ_ONCE (sqe -> ioprio );
406
400
if (sr -> flags & ~SENDMSG_FLAGS )
@@ -426,6 +420,8 @@ int io_sendmsg_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
426
420
return - ENOMEM ;
427
421
if (req -> opcode != IORING_OP_SENDMSG )
428
422
return io_send_setup (req , sqe );
423
+ if (unlikely (sqe -> addr2 || sqe -> file_index ))
424
+ return - EINVAL ;
429
425
return io_sendmsg_setup (req , sqe );
430
426
}
431
427
@@ -1303,11 +1299,6 @@ int io_send_zc_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
1303
1299
}
1304
1300
}
1305
1301
1306
- if (req -> opcode != IORING_OP_SEND_ZC ) {
1307
- if (unlikely (sqe -> addr2 || sqe -> file_index ))
1308
- return - EINVAL ;
1309
- }
1310
-
1311
1302
zc -> len = READ_ONCE (sqe -> len );
1312
1303
zc -> msg_flags = READ_ONCE (sqe -> msg_flags ) | MSG_NOSIGNAL | MSG_ZEROCOPY ;
1313
1304
req -> buf_index = READ_ONCE (sqe -> buf_index );
@@ -1323,6 +1314,8 @@ int io_send_zc_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
1323
1314
req -> flags |= REQ_F_IMPORT_BUFFER ;
1324
1315
return io_send_setup (req , sqe );
1325
1316
}
1317
+ if (unlikely (sqe -> addr2 || sqe -> file_index ))
1318
+ return - EINVAL ;
1326
1319
ret = io_sendmsg_setup (req , sqe );
1327
1320
if (unlikely (ret ))
1328
1321
return ret ;
0 commit comments