Re: [PATCH 1/1] net: sched: Deletion of an unnecessary check before the function call "kfree"

2014-11-19 Thread Daniel Borkmann

On 11/19/2014 05:47 PM, John Fastabend wrote:

On 11/18/2014 12:26 PM, SF Markus Elfring wrote:

From: Markus Elfring 

...

  if (fp_old)
  bpf_prog_destroy(fp_old);
-if (bpf_old)
-kfree(bpf_old);
+kfree(bpf_old);

  return 0;



Maybe I need some coffee but I can't figure out what this
patch is against...

# grep bpf_old ./net/sched/cls_bpf.c
#


Coffee is always good. :)

Yeah, you actually removed this in commit 1f947bf151e90ec ("net:
sched: rcu'ify cls_bpf"), so looks like Markus's tree is not
up to date ...
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Re: [PATCH 1/1] net: sched: Deletion of an unnecessary check before the function call "kfree"

2014-11-19 Thread John Fastabend

On 11/18/2014 12:26 PM, SF Markus Elfring wrote:

From: Markus Elfring 
Date: Tue, 18 Nov 2014 21:21:16 +0100

The kfree() function tests whether its argument is NULL and then
returns immediately. Thus the test around the call is not needed.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring 
---
  net/sched/cls_bpf.c | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/net/sched/cls_bpf.c b/net/sched/cls_bpf.c
index 0e30d58..f323944 100644
--- a/net/sched/cls_bpf.c
+++ b/net/sched/cls_bpf.c
@@ -212,8 +212,7 @@ static int cls_bpf_modify_existing(struct net *net, struct 
tcf_proto *tp,

if (fp_old)
bpf_prog_destroy(fp_old);
-   if (bpf_old)
-   kfree(bpf_old);
+   kfree(bpf_old);

return 0;




Maybe I need some coffee but I can't figure out what this
patch is against...

# grep bpf_old ./net/sched/cls_bpf.c
#

Marcus, what tree are you looking at?

--
John Fastabend Intel Corporation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[PATCH 1/1] net: sched: Deletion of an unnecessary check before the function call "kfree"

2014-11-18 Thread SF Markus Elfring
From: Markus Elfring 
Date: Tue, 18 Nov 2014 21:21:16 +0100

The kfree() function tests whether its argument is NULL and then
returns immediately. Thus the test around the call is not needed.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring 
---
 net/sched/cls_bpf.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/net/sched/cls_bpf.c b/net/sched/cls_bpf.c
index 0e30d58..f323944 100644
--- a/net/sched/cls_bpf.c
+++ b/net/sched/cls_bpf.c
@@ -212,8 +212,7 @@ static int cls_bpf_modify_existing(struct net *net, struct 
tcf_proto *tp,
 
if (fp_old)
bpf_prog_destroy(fp_old);
-   if (bpf_old)
-   kfree(bpf_old);
+   kfree(bpf_old);
 
return 0;
 
-- 
2.1.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/