lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[SCSI] iscsi_tcp: fix partial digest recv

Browse Source 
When a digest is spread across two network buffers, we currently
ignore this and try to check the digest with the partial buffer.
Or course this fails. This patch has use iscsi_tcp_copy to
copy the whole digest before testing it.

Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
Mike Christie
2006-08-31 18:09:32 -04:00
committed by James Bottomley
parent db98ccde08
commit ca5186842a
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/scsi/iscsi_tcp.c
View File

@@ -648,10 +648,9 @@ iscsi_ctask_copy(struct iscsi_tcp_conn *tcp_conn, struct iscsi_cmd_task *ctask,
* byte counters. * byte counters.
**/ **/
static inline int static inline int
iscsi_tcp_copy(struct iscsi_conn *conn) iscsi_tcp_copy(struct iscsi_conn *conn, int buf_size)
{ {
struct iscsi_tcp_conn *tcp_conn = conn->dd_data; struct iscsi_tcp_conn *tcp_conn = conn->dd_data;
int buf_size = tcp_conn->in.datalen;
int buf_left = buf_size - tcp_conn->data_copied; int buf_left = buf_size - tcp_conn->data_copied;
int size = min(tcp_conn->in.copy, buf_left); int size = min(tcp_conn->in.copy, buf_left);
int rc; int rc;
@@ -812,7 +811,7 @@ iscsi_data_recv(struct iscsi_conn *conn)
* Collect data segment to the connection's data * Collect data segment to the connection's data
* placeholder * placeholder
*/ */
if (iscsi_tcp_copy(conn)) { if (iscsi_tcp_copy(conn, tcp_conn->in.datalen)) {
rc = -EAGAIN; rc = -EAGAIN;
goto exit; goto exit;
} }
@@ -899,10 +898,15 @@ more:
debug_tcp("extra data_recv offset %d copy %d\n", debug_tcp("extra data_recv offset %d copy %d\n",
tcp_conn->in.offset, tcp_conn->in.copy); tcp_conn->in.offset, tcp_conn->in.copy);
skb_copy_bits(tcp_conn->in.skb, tcp_conn->in.offset, rc = iscsi_tcp_copy(conn, sizeof(uint32_t));
&recv_digest, 4); if (rc) {
tcp_conn->in.offset += 4; if (rc == -EAGAIN)
tcp_conn->in.copy -= 4; goto again;
iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED);
return 0;
}
memcpy(&recv_digest, conn->data, sizeof(uint32_t));
if (recv_digest != tcp_conn->in.datadgst) { if (recv_digest != tcp_conn->in.datadgst) {
debug_tcp("iscsi_tcp: data digest error!" debug_tcp("iscsi_tcp: data digest error!"
"0x%x != 0x%x\n", recv_digest, "0x%x != 0x%x\n", recv_digest,
@@ -945,6 +949,7 @@ more:
(u8 *) &tcp_conn->in.datadgst); (u8 *) &tcp_conn->in.datadgst);
debug_tcp("rx digest 0x%x\n", tcp_conn->in.datadgst); debug_tcp("rx digest 0x%x\n", tcp_conn->in.datadgst);
tcp_conn->in_progress = IN_PROGRESS_DDIGEST_RECV; tcp_conn->in_progress = IN_PROGRESS_DDIGEST_RECV;
tcp_conn->data_copied = 0;
} else } else
tcp_conn->in_progress = IN_PROGRESS_WAIT_HEADER; tcp_conn->in_progress = IN_PROGRESS_WAIT_HEADER;
} }