All of lore.kernel.org
 help / color / mirror / Atom feed
From: Varun Prakash <varun@chelsio.com>
To: Colin King <colin.king@canonical.com>
Cc: "James E . J . Bottomley" <jejb@linux.ibm.com>,
	"Martin K . Petersen" <martin.petersen@oracle.com>,
	linux-scsi@vger.kernel.org, kernel-janitors@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCH][next] scsi: cxgb4i: fix dereference of pointer tdata before it is null checked
Date: Mon, 13 Jul 2020 21:35:28 +0530	[thread overview]
Message-ID: <20200713160526.GA1704@chelsio.com> (raw)
In-Reply-To: <20200709135217.1408105-1-colin.king@canonical.com>

On Thu, Jul 09, 2020 at 02:52:17PM +0100, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
> 
> Currently pointer tdata is being dereferenced on the initialization of
> pointer skb before tdata is null checked. This could lead to a potential
> null pointer dereference.  Fix this by dereferencing tdata after tdata
> has been null pointer sanity checked.
> 
> Addresses-Coverity: ("Dereference before null check")
> Fixes: e33c2482289b ("scsi: cxgb4i: Add support for iSCSI segmentation offload")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>  drivers/scsi/cxgbi/libcxgbi.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/scsi/cxgbi/libcxgbi.c b/drivers/scsi/cxgbi/libcxgbi.c
> index 1fb101c616b7..a6119d9daedf 100644
> --- a/drivers/scsi/cxgbi/libcxgbi.c
> +++ b/drivers/scsi/cxgbi/libcxgbi.c
> @@ -2147,7 +2147,7 @@ int cxgbi_conn_init_pdu(struct iscsi_task *task, unsigned int offset,
>  	struct iscsi_conn *conn = task->conn;
>  	struct iscsi_tcp_task *tcp_task = task->dd_data;
>  	struct cxgbi_task_data *tdata = iscsi_task_cxgbi_data(task);
> -	struct sk_buff *skb = tdata->skb;
> +	struct sk_buff *skb;
>  	struct scsi_cmnd *sc = task->sc;
>  	u32 expected_count, expected_offset;
>  	u32 datalen = count, dlimit = 0;
> @@ -2161,6 +2161,7 @@ int cxgbi_conn_init_pdu(struct iscsi_task *task, unsigned int offset,
>  		       tcp_task ? tcp_task->dd_data : NULL, tdata);
>  		return -EINVAL;
>  	}
> +	skb = tdata->skb;
>  
>  	log_debug(1 << CXGBI_DBG_ISCSI | 1 << CXGBI_DBG_PDU_TX,
>  		  "task 0x%p,0x%p, skb 0x%p, 0x%x,0x%x,0x%x, %u+%u.\n",
> @@ -2365,7 +2366,7 @@ int cxgbi_conn_xmit_pdu(struct iscsi_task *task)
>  	struct iscsi_tcp_task *tcp_task = task->dd_data;
>  	struct cxgbi_task_data *tdata = iscsi_task_cxgbi_data(task);
>  	struct cxgbi_task_tag_info *ttinfo = &tdata->ttinfo;
> -	struct sk_buff *skb = tdata->skb;
> +	struct sk_buff *skb;
>  	struct cxgbi_sock *csk = NULL;
>  	u32 pdulen = 0;
>  	u32 datalen;
> @@ -2378,6 +2379,7 @@ int cxgbi_conn_xmit_pdu(struct iscsi_task *task)
>  		return -EINVAL;
>  	}
>  
> +	skb = tdata->skb;
>  	if (!skb) {
>  		log_debug(1 << CXGBI_DBG_ISCSI | 1 << CXGBI_DBG_PDU_TX,
>  			  "task 0x%p, skb NULL.\n", task);

Acked-by: Varun Prakash <varun@chelsio.com>

WARNING: multiple messages have this Message-ID (diff)
From: Varun Prakash <varun@chelsio.com>
To: Colin King <colin.king@canonical.com>
Cc: "James E . J . Bottomley" <jejb@linux.ibm.com>,
	"Martin K . Petersen" <martin.petersen@oracle.com>,
	linux-scsi@vger.kernel.org, kernel-janitors@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCH][next] scsi: cxgb4i: fix dereference of pointer tdata before it is null checked
Date: Mon, 13 Jul 2020 16:17:28 +0000	[thread overview]
Message-ID: <20200713160526.GA1704@chelsio.com> (raw)
In-Reply-To: <20200709135217.1408105-1-colin.king@canonical.com>

On Thu, Jul 09, 2020 at 02:52:17PM +0100, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
> 
> Currently pointer tdata is being dereferenced on the initialization of
> pointer skb before tdata is null checked. This could lead to a potential
> null pointer dereference.  Fix this by dereferencing tdata after tdata
> has been null pointer sanity checked.
> 
> Addresses-Coverity: ("Dereference before null check")
> Fixes: e33c2482289b ("scsi: cxgb4i: Add support for iSCSI segmentation offload")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>  drivers/scsi/cxgbi/libcxgbi.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/scsi/cxgbi/libcxgbi.c b/drivers/scsi/cxgbi/libcxgbi.c
> index 1fb101c616b7..a6119d9daedf 100644
> --- a/drivers/scsi/cxgbi/libcxgbi.c
> +++ b/drivers/scsi/cxgbi/libcxgbi.c
> @@ -2147,7 +2147,7 @@ int cxgbi_conn_init_pdu(struct iscsi_task *task, unsigned int offset,
>  	struct iscsi_conn *conn = task->conn;
>  	struct iscsi_tcp_task *tcp_task = task->dd_data;
>  	struct cxgbi_task_data *tdata = iscsi_task_cxgbi_data(task);
> -	struct sk_buff *skb = tdata->skb;
> +	struct sk_buff *skb;
>  	struct scsi_cmnd *sc = task->sc;
>  	u32 expected_count, expected_offset;
>  	u32 datalen = count, dlimit = 0;
> @@ -2161,6 +2161,7 @@ int cxgbi_conn_init_pdu(struct iscsi_task *task, unsigned int offset,
>  		       tcp_task ? tcp_task->dd_data : NULL, tdata);
>  		return -EINVAL;
>  	}
> +	skb = tdata->skb;
>  
>  	log_debug(1 << CXGBI_DBG_ISCSI | 1 << CXGBI_DBG_PDU_TX,
>  		  "task 0x%p,0x%p, skb 0x%p, 0x%x,0x%x,0x%x, %u+%u.\n",
> @@ -2365,7 +2366,7 @@ int cxgbi_conn_xmit_pdu(struct iscsi_task *task)
>  	struct iscsi_tcp_task *tcp_task = task->dd_data;
>  	struct cxgbi_task_data *tdata = iscsi_task_cxgbi_data(task);
>  	struct cxgbi_task_tag_info *ttinfo = &tdata->ttinfo;
> -	struct sk_buff *skb = tdata->skb;
> +	struct sk_buff *skb;
>  	struct cxgbi_sock *csk = NULL;
>  	u32 pdulen = 0;
>  	u32 datalen;
> @@ -2378,6 +2379,7 @@ int cxgbi_conn_xmit_pdu(struct iscsi_task *task)
>  		return -EINVAL;
>  	}
>  
> +	skb = tdata->skb;
>  	if (!skb) {
>  		log_debug(1 << CXGBI_DBG_ISCSI | 1 << CXGBI_DBG_PDU_TX,
>  			  "task 0x%p, skb NULL.\n", task);

Acked-by: Varun Prakash <varun@chelsio.com>

  reply	other threads:[~2020-07-13 16:05 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-09 13:52 [PATCH][next] scsi: cxgb4i: fix dereference of pointer tdata before it is null checked Colin King
2020-07-09 13:52 ` Colin King
2020-07-13 16:05 ` Varun Prakash [this message]
2020-07-13 16:17   ` Varun Prakash
2020-07-14  4:58 ` Martin K. Petersen
2020-07-14  4:58   ` Martin K. Petersen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200713160526.GA1704@chelsio.com \
    --to=varun@chelsio.com \
    --cc=colin.king@canonical.com \
    --cc=jejb@linux.ibm.com \
    --cc=kernel-janitors@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-scsi@vger.kernel.org \
    --cc=martin.petersen@oracle.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.