[PATCH] ipv4: fib_semantics: increment fib_info_cnt after fib_info allocation

[PATCH] ipv4: fib_semantics: increment fib_info_cnt after fib_info allocation

[Sergey Popovich]

Increment fib_info_cnt in fib_create_info() right after successfuly
alllocating fib_info structure, overwise fib_metrics allocation failure
leads to fib_info_cnt incorrectly decremented in free_fib_info(), called
on error path from fib_create_info().

Signed-off-by: Sergey Popovich <popovich_sergei@mail.ru>
---
 net/ipv4/fib_semantics.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
index b53f0bf..9d43468 100644
--- a/net/ipv4/fib_semantics.c
+++ b/net/ipv4/fib_semantics.c
@@ -820,13 +820,13 @@ struct fib_info *fib_create_info(struct fib_config *cfg)
 	fi = kzalloc(sizeof(*fi)+nhs*sizeof(struct fib_nh), GFP_KERNEL);
 	if (fi == NULL)
 		goto failure;
+	fib_info_cnt++;
 	if (cfg->fc_mx) {
 		fi->fib_metrics = kzalloc(sizeof(u32) * RTAX_MAX, GFP_KERNEL);
 		if (!fi->fib_metrics)
 			goto failure;
 	} else
 		fi->fib_metrics = (u32 *) dst_default_metrics;
-	fib_info_cnt++;
 
 	fi->fib_net = hold_net(net);
 	fi->fib_protocol = cfg->fc_protocol;
-- 
1.8.3.4

Re: [PATCH] ipv4: fib_semantics: increment fib_info_cnt after fib_info allocation

[David Miller]

From: Sergey Popovich <popovich_sergei@mail.ru>
Date: Tue,  6 May 2014 18:23:08 +0300

> Increment fib_info_cnt in fib_create_info() right after successfuly
> alllocating fib_info structure, overwise fib_metrics allocation failure
> leads to fib_info_cnt incorrectly decremented in free_fib_info(), called
> on error path from fib_create_info().
> 
> Signed-off-by: Sergey Popovich <popovich_sergei@mail.ru>

Applied and queued up for -stable, thanks Sergey.