Skip to content

Commit 566e1ce

Browse files
arndbgregkh
authored andcommitted
staging: lustre: ko2iblnd: check copy_from_iter/copy_to_iter return code
We now get a helpful warning for code that calls copy_{from,to}_iter without checking the return value, introduced by commit aa28de2 ("iov_iter/hardening: move object size checks to inlined part"). drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c: In function 'kiblnd_send': drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c:1643:2: error: ignoring return value of 'copy_from_iter', declared with attribute warn_unused_result [-Werror=unused-result] drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c: In function 'kiblnd_recv': drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c:1744:3: error: ignoring return value of 'copy_to_iter', declared with attribute warn_unused_result [-Werror=unused-result] In case we get short copies here, we may get incorrect behavior. I've added failure handling for both rx and tx now, returning -EFAULT as expected. Cc: [email protected] Signed-off-by: Arnd Bergmann <[email protected]> Signed-off-by: James Simmons <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent dd55d44 commit 566e1ce

File tree

1 file changed

+15
-4
lines changed

1 file changed

+15
-4
lines changed

drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1640,8 +1640,13 @@ kiblnd_send(struct lnet_ni *ni, void *private, struct lnet_msg *lntmsg)
16401640
ibmsg = tx->tx_msg;
16411641
ibmsg->ibm_u.immediate.ibim_hdr = *hdr;
16421642

1643-
copy_from_iter(&ibmsg->ibm_u.immediate.ibim_payload, IBLND_MSG_SIZE,
1644-
&from);
1643+
rc = copy_from_iter(&ibmsg->ibm_u.immediate.ibim_payload, payload_nob,
1644+
&from);
1645+
if (rc != payload_nob) {
1646+
kiblnd_pool_free_node(&tx->tx_pool->tpo_pool, &tx->tx_list);
1647+
return -EFAULT;
1648+
}
1649+
16451650
nob = offsetof(struct kib_immediate_msg, ibim_payload[payload_nob]);
16461651
kiblnd_init_tx_msg(ni, tx, IBLND_MSG_IMMEDIATE, nob);
16471652

@@ -1741,8 +1746,14 @@ kiblnd_recv(struct lnet_ni *ni, void *private, struct lnet_msg *lntmsg,
17411746
break;
17421747
}
17431748

1744-
copy_to_iter(&rxmsg->ibm_u.immediate.ibim_payload,
1745-
IBLND_MSG_SIZE, to);
1749+
rc = copy_to_iter(&rxmsg->ibm_u.immediate.ibim_payload, rlen,
1750+
to);
1751+
if (rc != rlen) {
1752+
rc = -EFAULT;
1753+
break;
1754+
}
1755+
1756+
rc = 0;
17461757
lnet_finalize(ni, lntmsg, 0);
17471758
break;
17481759

0 commit comments

Comments
 (0)