On Mon, 2015-01-26 at 12:49 +0200, Sagi Grimberg wrote:
> if text message dlength is 0, don't allocate a buffer for it, pass
> NULL to iscsit_process_text_cmd.
>
> Signed-off-by: Sagi Grimberg <sagig@xxxxxxxxxxxx>
> ---
> drivers/infiniband/ulp/isert/ib_isert.c | 14 ++++++++------
> 1 files changed, 8 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/infiniband/ulp/isert/ib_isert.c b/drivers/infiniband/ulp/isert/ib_isert.c
> index 7f6a0d2..1d31ffb 100644
> --- a/drivers/infiniband/ulp/isert/ib_isert.c
> +++ b/drivers/infiniband/ulp/isert/ib_isert.c
> @@ -1351,17 +1351,19 @@ isert_handle_text_cmd(struct isert_conn *isert_conn, struct isert_cmd *isert_cmd
> struct iscsi_conn *conn = isert_conn->conn;
> u32 payload_length = ntoh24(hdr->dlength);
> int rc;
> - unsigned char *text_in;
> + unsigned char *text_in = NULL;
>
> rc = iscsit_setup_text_cmd(conn, cmd, hdr);
> if (rc < 0)
> return rc;
>
> - text_in = kzalloc(payload_length, GFP_KERNEL);
> - if (!text_in) {
> - isert_err("Unable to allocate text_in of payload_length: %u\n",
> - payload_length);
> - return -ENOMEM;
> + if (payload_length) {
> + text_in = kzalloc(payload_length, GFP_KERNEL);
> + if (!text_in) {
> + isert_err("Unable to allocate text_in of payload_length: %u\n",
> + payload_length);
> + return -ENOMEM;
> + }
> }
> cmd->text_in_ptr = text_in;
>
Applied to target-pending/for-next. Thanks Sagi!
--nab
--
To unsubscribe from this list: send the line "unsubscribe target-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
