net/netlabel: Correct redundant test
entry was tested for NULL near the beginning of the function, followed by a return, and there is no intervening modification of its value. A simplified version of the semantic match that finds this problem is as follows: (http://www.emn.fr/x-info/coccinelle/) // <smpl> @r exists@ local idexpression x; expression E; position p1,p2; @@ if (x == NULL || ...) { ... when forall return ...; } ... when != \(x=E\|x--\|x++\|--x\|++x\|x-=E\|x+=E\|x|=E\|x&=E\|&x\) ( *x == NULL | *x != NULL ) // </smpl> Signed-off-by: Julia Lawall <julia@diku.dk> Acked-by: Paul Moore <paul.moore@hp.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
463889e27e
commit
4794323444
|
@ -185,8 +185,7 @@ int netlbl_cfg_unlbl_map_add(const char *domain,
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
cfg_unlbl_map_add_failure:
|
cfg_unlbl_map_add_failure:
|
||||||
if (entry != NULL)
|
kfree(entry->domain);
|
||||||
kfree(entry->domain);
|
|
||||||
kfree(entry);
|
kfree(entry);
|
||||||
kfree(addrmap);
|
kfree(addrmap);
|
||||||
kfree(map4);
|
kfree(map4);
|
||||||
|
@ -385,8 +384,7 @@ int netlbl_cfg_cipsov4_map_add(u32 doi,
|
||||||
|
|
||||||
cfg_cipsov4_map_add_failure:
|
cfg_cipsov4_map_add_failure:
|
||||||
cipso_v4_doi_putdef(doi_def);
|
cipso_v4_doi_putdef(doi_def);
|
||||||
if (entry != NULL)
|
kfree(entry->domain);
|
||||||
kfree(entry->domain);
|
|
||||||
kfree(entry);
|
kfree(entry);
|
||||||
kfree(addrmap);
|
kfree(addrmap);
|
||||||
kfree(addrinfo);
|
kfree(addrinfo);
|
||||||
|
|
Loading…
Reference in New Issue