| Message ID | Pine.LNX.4.64.0907301637570.8734@ask.diku.dk |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Thursday 30 July 2009 10:38:19 am Julia Lawall wrote: > From: Julia Lawall <julia@diku.dk> > > The test on map4 should be a test on map6. > > The semantic match that finds this problem is as follows: > (http://www.emn.fr/x-info/coccinelle/) > > // <smpl> > @@ > expression *x; > identifier f; > constant char *C; > @@ > > x = \(kmalloc\|kcalloc\|kzalloc\)(...); > ... when != x == NULL > when != x != NULL > when != (x || ...) > ( > kfree(x) > > f(...,C,...,x,...) > > *f(...,x,...) > > *x->f > ) > // </smpl> > > Signed-off-by: Julia Lawall <julia@diku.dk> Much better, thank you. Acked-by: Paul Moore <paul.moore@hp.com> > --- > net/netlabel/netlabel_kapi.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/net/netlabel/netlabel_kapi.c b/net/netlabel/netlabel_kapi.c > index 3ff6f32..6ce0020 100644 > --- a/net/netlabel/netlabel_kapi.c > +++ b/net/netlabel/netlabel_kapi.c > @@ -151,7 +151,7 @@ int netlbl_cfg_unlbl_map_add(const char *domain, > addr6 = addr; > mask6 = mask; > map6 = kzalloc(sizeof(*map6), GFP_ATOMIC); > - if (map4 == NULL) > + if (map6 == NULL) > goto cfg_unlbl_map_add_failure; > map6->type = NETLBL_NLTYPE_UNLABELED; > ipv6_addr_copy(&map6->list.addr, addr6);
From: Paul Moore <paul.moore@hp.com> Date: Thu, 30 Jul 2009 10:53:37 -0400 > On Thursday 30 July 2009 10:38:19 am Julia Lawall wrote: >> From: Julia Lawall <julia@diku.dk> >> >> The test on map4 should be a test on map6. >> >> The semantic match that finds this problem is as follows: >> (http://www.emn.fr/x-info/coccinelle/) ... >> Signed-off-by: Julia Lawall <julia@diku.dk> > > Much better, thank you. > > Acked-by: Paul Moore <paul.moore@hp.com> Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/netlabel/netlabel_kapi.c b/net/netlabel/netlabel_kapi.c index 3ff6f32..6ce0020 100644 --- a/net/netlabel/netlabel_kapi.c +++ b/net/netlabel/netlabel_kapi.c @@ -151,7 +151,7 @@ int netlbl_cfg_unlbl_map_add(const char *domain, addr6 = addr; mask6 = mask; map6 = kzalloc(sizeof(*map6), GFP_ATOMIC); - if (map4 == NULL) + if (map6 == NULL) goto cfg_unlbl_map_add_failure; map6->type = NETLBL_NLTYPE_UNLABELED; ipv6_addr_copy(&map6->list.addr, addr6);