Commit ea63e60f authored by Colin Ian King's avatar Colin Ian King Committed by Martin K. Petersen

scsi: cxgbi: remove redundant __kfree_skb call on skb and free cst->atid

The error return path via label rel_resource checks for a non-null skb
before free'ing it.  However, skb is always null at this exit path, so the
null check and the free are redundant and can be removed.  Removing this
allows the original goto's to rel_resource to be cleaned up; the first can
be replaced by a return of -EINVAL, the second can be replaced by a more
appropriate -ENOMEM return and fix a memory leak by freeing csk->atid.

Addresses-Coverity: ("Logically Dead Code")
Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
Reviewed-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent c8538b0b
...@@ -979,14 +979,17 @@ static int init_act_open(struct cxgbi_sock *csk) ...@@ -979,14 +979,17 @@ static int init_act_open(struct cxgbi_sock *csk)
csk->atid = cxgb3_alloc_atid(t3dev, &t3_client, csk); csk->atid = cxgb3_alloc_atid(t3dev, &t3_client, csk);
if (csk->atid < 0) { if (csk->atid < 0) {
pr_err("NO atid available.\n"); pr_err("NO atid available.\n");
goto rel_resource; return -EINVAL;
} }
cxgbi_sock_set_flag(csk, CTPF_HAS_ATID); cxgbi_sock_set_flag(csk, CTPF_HAS_ATID);
cxgbi_sock_get(csk); cxgbi_sock_get(csk);
skb = alloc_wr(sizeof(struct cpl_act_open_req), 0, GFP_KERNEL); skb = alloc_wr(sizeof(struct cpl_act_open_req), 0, GFP_KERNEL);
if (!skb) if (!skb) {
goto rel_resource; cxgb3_free_atid(t3dev, csk->atid);
cxgbi_sock_put(csk);
return -ENOMEM;
}
skb->sk = (struct sock *)csk; skb->sk = (struct sock *)csk;
set_arp_failure_handler(skb, act_open_arp_failure); set_arp_failure_handler(skb, act_open_arp_failure);
csk->snd_win = cxgb3i_snd_win; csk->snd_win = cxgb3i_snd_win;
...@@ -1007,11 +1010,6 @@ static int init_act_open(struct cxgbi_sock *csk) ...@@ -1007,11 +1010,6 @@ static int init_act_open(struct cxgbi_sock *csk)
cxgbi_sock_set_state(csk, CTP_ACTIVE_OPEN); cxgbi_sock_set_state(csk, CTP_ACTIVE_OPEN);
send_act_open_req(csk, skb, csk->l2t); send_act_open_req(csk, skb, csk->l2t);
return 0; return 0;
rel_resource:
if (skb)
__kfree_skb(skb);
return -EINVAL;
} }
cxgb3_cpl_handler_func cxgb3i_cpl_handlers[NUM_CPL_CMDS] = { cxgb3_cpl_handler_func cxgb3i_cpl_handlers[NUM_CPL_CMDS] = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment