| From foo@baz Wed May 28 21:03:54 PDT 2014 |
| From: Sergey Popovich <popovich_sergei@mail.ru> |
| Date: Tue, 6 May 2014 18:23:08 +0300 |
| Subject: ipv4: fib_semantics: increment fib_info_cnt after |
| fib_info allocation |
| |
| From: Sergey Popovich <popovich_sergei@mail.ru> |
| |
| [ Upstream commit aeefa1ecfc799b0ea2c4979617f14cecd5cccbfd ] |
| |
| 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> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| net/ipv4/fib_semantics.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/net/ipv4/fib_semantics.c |
| +++ b/net/ipv4/fib_semantics.c |
| @@ -820,13 +820,13 @@ struct fib_info *fib_create_info(struct |
| 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; |