ipv4/fib_hash.c: fix NULL dereference
Subsystems (3)
RFC PATCH 1/1 ipv4/fib_hash.c: fix NULL dereference
Unless I miss a guaranteed relation between between "f" and "new_fa->fa_info" this patch is required for fixing a NULL dereference introduced by commit a6501e080c318f8d4467679d17807f42b3a33cd5 and spotted by the Coverity checker.
---
net/ipv4/fib_hash.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
net/ipv4/fib_hash.c renamed from net/ipv4/fib_hash.c.old +5 -5
@@ -367,17 +367,18 @@ static struct fib_node *fib_find_node(st }return NULL ; }static int fn_hash_insert (struct fib_table *tb,struct fib_config *cfg) {struct fn_hash *table = (struct fn_hash *) tb->tb_data; -struct fib_node *new_f, *f; +struct fib_node *new_f =NULL ; +struct fib_node *f;struct fib_alias *fa, *new_fa;struct fn_zone *fz;struct fib_info *fi;u8 tos = cfg->fc_tos;__be32 key;int err;if (cfg->fc_dst_len >32 )
@@ -491,33 +492,32 @@ static int fn_hash_insert(struct fib_tab } err = -ENOENT ;if (!(cfg->fc_nlflags &NLM_F_CREATE )) goto out; err = -ENOBUFS ; - new_f =NULL ;if (!f) { new_f =kmem_cache_zalloc (fn_hash_kmem,GFP_KERNEL );if (new_f ==NULL ) goto out;INIT_HLIST_NODE (&new_f->fn_hash);INIT_LIST_HEAD (&new_f->fn_alias); new_f->fn_key = key; f = new_f; } new_fa = &f->fn_embedded_alias;if (new_fa->fa_info !=NULL ) { new_fa =kmem_cache_alloc (fn_alias_kmem,GFP_KERNEL );if (new_fa ==NULL ) - goto out_free_new_f; + goto out; } new_fa->fa_info = fi; new_fa->fa_tos = tos; new_fa->fa_type = cfg->fc_type; new_fa->fa_scope = cfg->fc_scope; new_fa->fa_state =0 ;/*
@@ -535,19 +535,19 @@ static int fn_hash_insert(struct fib_tabif (new_f) fz->fz_nent++;rt_cache_flush (-1 );rtmsg_fib (RTM_NEWROUTE , key, new_fa, cfg->fc_dst_len, tb->tb_id, &cfg->fc_nlinfo,0 );return 0 ; -out_free_new_f: -kmem_cache_free (fn_hash_kmem, new_f); out: +if (new_f) +kmem_cache_free (fn_hash_kmem, new_f);fib_release_info (fi);return err; }static int fn_hash_delete (struct fib_table *tb,struct fib_config *cfg) {struct fn_hash *table = (struct fn_hash *)tb->tb_data;
Quoted 80 lines · Adrian Bunk
Unless I miss a guaranteed relation between between "f" and "
new_fa->fa_info" this patch is required for fixing a NULL dereference introduced by commita6501e080c318f8d4467679d17807f42b3a33cd5and spotted by the Coverity checker.Signed-off-by Adrian Bunk <[email protected]>---
net/ipv4/fib_hash.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)net/ipv4/fib_hash.c renamed from net/ipv4/fib_hash.c.old +3
-5@@ -367,17 +367,18 @@ static struct fib_node *fib_find_node(st }return NULL ; }static int fn_hash_insert (struct fib_table *tb,struct fib_config *cfg) {struct fn_hash *table = (struct fn_hash *) tb->tb_data; -struct fib_node *new_f, *f; +struct fib_node *new_f =NULL ; +struct fib_node *f;struct fib_alias *fa, *new_fa;struct fn_zone *fz;struct fib_info *fi;u8 tos = cfg->fc_tos;__be32 key;int err;if (cfg->fc_dst_len >32 )@@ -491,33 +492,32 @@ static int fn_hash_insert(struct fib_tab } err = -ENOENT ;if (!(cfg->fc_nlflags &NLM_F_CREATE )) goto out; err = -ENOBUFS ; - new_f =NULL ;if (!f) { new_f =kmem_cache_zalloc (fn_hash_kmem,GFP_KERNEL );if (new_f ==NULL ) goto out;INIT_HLIST_NODE (&new_f->fn_hash);INIT_LIST_HEAD (&new_f->fn_alias); new_f->fn_key = key; f = new_f; } new_fa = &f->fn_embedded_alias;if (new_fa->fa_info !=NULL ) { new_fa =kmem_cache_alloc (fn_alias_kmem,GFP_KERNEL );if (new_fa ==NULL ) - goto out_free_new_f; + goto out; } new_fa->fa_info = fi; new_fa->fa_tos = tos; new_fa->fa_type = cfg->fc_type; new_fa->fa_scope = cfg->fc_scope; new_fa->fa_state =0 ;/* @@ -535,19 +535,19 @@ static int fn_hash_insert(struct fib_tabif (new_f) fz->fz_nent++;rt_cache_flush (-1 );rtmsg_fib (RTM_NEWROUTE , key, new_fa, cfg->fc_dst_len, tb->tb_id, &cfg->fc_nlinfo,0 );return 0 ; -out_free_new_f: -kmem_cache_free (fn_hash_kmem, new_f); out:
net/ipv4/fib_hash.c static int fn_hash_insert(struct fib_tab · line 553
Quoted 10 lines
net/ipv4/fib_hash.c renamed from net/ipv4/fib_hash.c.old +2
-0+if (new_f) +kmem_cache_free (fn_hash_kmem, new_f);fib_release_info (fi);return err; }static int fn_hash_delete (struct fib_table *tb,struct fib_config *cfg) {struct fn_hash *table = (struct fn_hash *)tb->tb_data;
Hum, you are right, kmem_cache_free() doesnt allow a NULL object, like kfree() does.
From: Eric Dumazet <[email protected]>
Date: Wed, 20 Feb 2008 00:06:14 +0100
Quoted 7 lines
Quoted 6 lines · Adrian Bunk
Unless I miss a guaranteed relation between between "f" and "
new_fa->fa_info" this patch is required for fixing a NULL dereference introduced by commita6501e080c318f8d4467679d17807f42b3a33cd5and spotted by the Coverity checker.Signed-off-by Adrian Bunk <[email protected]>
...
Quoted 2 lines
Hum, you are right,
kmem_cache_free()doesnt allow a NULL object, likekfree()does.
Applied, thanks everyone.