* [PATCH][V2] scsi: cxgb3i: remove redundant null check and kfree on skb
@ 2017-03-14 10:48 Colin King
2017-03-14 11:12 ` Dan Carpenter
2017-03-14 11:34 ` Johannes Thumshirn
0 siblings, 2 replies; 5+ messages in thread
From: Colin King @ 2017-03-14 10:48 UTC (permalink / raw)
To: Karen Xie, James E . J . Bottomley, Martin K . Petersen, linux-scsi
Cc: kernel-janitors, linux-kernel
From: Colin Ian King <colin.king@canonical.com>
On the error exit path, skb is always null, so the non-null check
and __kfree_skb call are redundant. Remove the redundant code and
just directly return with the appropriate error return code.
Detected by CoverityScan, CID#114328 ("Logically Dead Code")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
drivers/scsi/cxgbi/cxgb3i/cxgb3i.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c b/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c
index 1880eb6..3c9f8cf2 100644
--- a/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c
+++ b/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c
@@ -979,14 +979,14 @@ static int init_act_open(struct cxgbi_sock *csk)
csk->atid = cxgb3_alloc_atid(t3dev, &t3_client, csk);
if (csk->atid < 0) {
pr_err("NO atid available.\n");
- goto rel_resource;
+ return -EINVAL;
}
cxgbi_sock_set_flag(csk, CTPF_HAS_ATID);
cxgbi_sock_get(csk);
skb = alloc_wr(sizeof(struct cpl_act_open_req), 0, GFP_KERNEL);
if (!skb)
- goto rel_resource;
+ return -ENOMEM;
skb->sk = (struct sock *)csk;
set_arp_failure_handler(skb, act_open_arp_failure);
csk->snd_win = cxgb3i_snd_win;
@@ -1007,11 +1007,6 @@ static int init_act_open(struct cxgbi_sock *csk)
cxgbi_sock_set_state(csk, CTP_ACTIVE_OPEN);
send_act_open_req(csk, skb, csk->l2t);
return 0;
-
-rel_resource:
- if (skb)
- __kfree_skb(skb);
- return -EINVAL;
}
cxgb3_cpl_handler_func cxgb3i_cpl_handlers[NUM_CPL_CMDS] = {
--
2.10.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH][V2] scsi: cxgb3i: remove redundant null check and kfree on skb
2017-03-14 10:48 [PATCH][V2] scsi: cxgb3i: remove redundant null check and kfree on skb Colin King
@ 2017-03-14 11:12 ` Dan Carpenter
2017-03-14 11:34 ` Johannes Thumshirn
1 sibling, 0 replies; 5+ messages in thread
From: Dan Carpenter @ 2017-03-14 11:12 UTC (permalink / raw)
To: Colin King
Cc: Karen Xie, James E . J . Bottomley, Martin K . Petersen,
linux-scsi, kernel-janitors, linux-kernel
Thanks!
regards,
dan carpenter
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH][V2] scsi: cxgb3i: remove redundant null check and kfree on skb
@ 2017-03-14 11:12 ` Dan Carpenter
0 siblings, 0 replies; 5+ messages in thread
From: Dan Carpenter @ 2017-03-14 11:12 UTC (permalink / raw)
To: Colin King
Cc: Karen Xie, James E . J . Bottomley, Martin K . Petersen,
linux-scsi, kernel-janitors, linux-kernel
Thanks!
regards,
dan carpenter
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH][V2] scsi: cxgb3i: remove redundant null check and kfree on skb
2017-03-14 10:48 [PATCH][V2] scsi: cxgb3i: remove redundant null check and kfree on skb Colin King
@ 2017-03-14 11:34 ` Johannes Thumshirn
2017-03-14 11:34 ` Johannes Thumshirn
1 sibling, 0 replies; 5+ messages in thread
From: Johannes Thumshirn @ 2017-03-14 11:34 UTC (permalink / raw)
To: Colin King
Cc: Karen Xie, James E . J . Bottomley, Martin K . Petersen,
linux-scsi, kernel-janitors, linux-kernel
On Tue, Mar 14, 2017 at 10:48:43AM +0000, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> On the error exit path, skb is always null, so the non-null check
> and __kfree_skb call are redundant. Remove the redundant code and
> just directly return with the appropriate error return code.
>
> Detected by CoverityScan, CID#114328 ("Logically Dead Code")
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
> drivers/scsi/cxgbi/cxgb3i/cxgb3i.c | 9 ++-------
> 1 file changed, 2 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c b/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c
> index 1880eb6..3c9f8cf2 100644
> --- a/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c
> +++ b/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c
> @@ -979,14 +979,14 @@ static int init_act_open(struct cxgbi_sock *csk)
> csk->atid = cxgb3_alloc_atid(t3dev, &t3_client, csk);
> if (csk->atid < 0) {
> pr_err("NO atid available.\n");
> - goto rel_resource;
> + return -EINVAL;
> }
> cxgbi_sock_set_flag(csk, CTPF_HAS_ATID);
> cxgbi_sock_get(csk);
>
> skb = alloc_wr(sizeof(struct cpl_act_open_req), 0, GFP_KERNEL);
> if (!skb)
> - goto rel_resource;
> + return -ENOMEM;
I don't think that's correct, not that it was before. cxgbi_sock_get(csk) does a
kref_get(&csk->refcnt), so this will at lease leak a kref. It will also "leak"
the atids_in_use in cxgb3_alloc_atid() as there's a call to cxgb3_free_atid()
missing. Looks like the complete cleanup path is worng here.
But I'd prefer having Karen or someone else at Chelsio confirm my assumptions.
Thanks,
Johannes
--
Johannes Thumshirn Storage
jthumshirn@suse.de +49 911 74053 689
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: Felix Imendörffer, Jane Smithard, Graham Norton
HRB 21284 (AG Nürnberg)
Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH][V2] scsi: cxgb3i: remove redundant null check and kfree on skb
@ 2017-03-14 11:34 ` Johannes Thumshirn
0 siblings, 0 replies; 5+ messages in thread
From: Johannes Thumshirn @ 2017-03-14 11:34 UTC (permalink / raw)
To: Colin King
Cc: Karen Xie, James E . J . Bottomley, Martin K . Petersen,
linux-scsi, kernel-janitors, linux-kernel
On Tue, Mar 14, 2017 at 10:48:43AM +0000, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> On the error exit path, skb is always null, so the non-null check
> and __kfree_skb call are redundant. Remove the redundant code and
> just directly return with the appropriate error return code.
>
> Detected by CoverityScan, CID#114328 ("Logically Dead Code")
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
> drivers/scsi/cxgbi/cxgb3i/cxgb3i.c | 9 ++-------
> 1 file changed, 2 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c b/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c
> index 1880eb6..3c9f8cf2 100644
> --- a/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c
> +++ b/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c
> @@ -979,14 +979,14 @@ static int init_act_open(struct cxgbi_sock *csk)
> csk->atid = cxgb3_alloc_atid(t3dev, &t3_client, csk);
> if (csk->atid < 0) {
> pr_err("NO atid available.\n");
> - goto rel_resource;
> + return -EINVAL;
> }
> cxgbi_sock_set_flag(csk, CTPF_HAS_ATID);
> cxgbi_sock_get(csk);
>
> skb = alloc_wr(sizeof(struct cpl_act_open_req), 0, GFP_KERNEL);
> if (!skb)
> - goto rel_resource;
> + return -ENOMEM;
I don't think that's correct, not that it was before. cxgbi_sock_get(csk) does a
kref_get(&csk->refcnt), so this will at lease leak a kref. It will also "leak"
the atids_in_use in cxgb3_alloc_atid() as there's a call to cxgb3_free_atid()
missing. Looks like the complete cleanup path is worng here.
But I'd prefer having Karen or someone else at Chelsio confirm my assumptions.
Thanks,
Johannes
--
Johannes Thumshirn Storage
jthumshirn@suse.de +49 911 74053 689
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: Felix Imendörffer, Jane Smithard, Graham Norton
HRB 21284 (AG Nürnberg)
Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-03-14 11:34 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-14 10:48 [PATCH][V2] scsi: cxgb3i: remove redundant null check and kfree on skb Colin King
2017-03-14 11:12 ` Dan Carpenter
2017-03-14 11:12 ` Dan Carpenter
2017-03-14 11:34 ` Johannes Thumshirn
2017-03-14 11:34 ` Johannes Thumshirn
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.