Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

iscsi-scst: Fix up the error handling to avoid crash #62

Merged
merged 2 commits into from
Jun 28, 2022
Merged

iscsi-scst: Fix up the error handling to avoid crash #62

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6752b8
iscsi-scst: Make exit_tx() return void
lnocturno Jun 27, 2022
14edfee
iscsi-scst: Fix up the error handling to avoid crash
lnocturno Jun 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions iscsi-scst/kernel/nthread.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1331,7 +1331,7 @@ static int write_data(struct iscsi_conn *conn)
goto out;
}

static int exit_tx(struct iscsi_conn *conn, int res)
static void exit_tx(struct iscsi_conn *conn, int res)
{
iscsi_extracheck_is_wr_thread(conn);

Expand All @@ -1355,7 +1355,8 @@ static int exit_tx(struct iscsi_conn *conn, int res)
mark_conn_closed(conn);
break;
}
return res;

return;
}

static int tx_ddigest(struct iscsi_cmnd *cmnd, int state)
Expand All @@ -1377,7 +1378,7 @@ static int tx_ddigest(struct iscsi_cmnd *cmnd, int state)
if (!cmnd->conn->write_size)
cmnd->conn->write_state = state;
} else
res = exit_tx(cmnd->conn, res);
exit_tx(cmnd->conn, res);

return res;
}
Expand Down Expand Up @@ -1424,7 +1425,7 @@ static int tx_padding(struct iscsi_cmnd *cmnd, int state)
if (!cmnd->conn->write_size)
cmnd->conn->write_state = state;
} else
res = exit_tx(cmnd->conn, res);
exit_tx(cmnd->conn, res);

return res;
}
Expand All @@ -1440,7 +1441,7 @@ static int iscsi_do_send(struct iscsi_conn *conn, int state)
if (!conn->write_size)
conn->write_state = state;
} else
res = exit_tx(conn, res);
exit_tx(conn, res);

return res;
}
Expand Down Expand Up @@ -1510,9 +1511,6 @@ int iscsi_send(struct iscsi_conn *conn)
sBUG();
}

if (res == 0)
goto out;

if (conn->write_state != TX_END)
goto out;

Expand Down