diff options
| author | Sergey Popovich <popovich_sergei@mail.ru> | 2014-05-06 18:23:08 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-30 21:52:16 -0700 |
| commit | 6e020d8ab8dad5c4ebb5317898d05d437a6f5c49 (patch) | |
| tree | ca925dbf6b6ba540c19dce3251dbf71965e2c3a9 /net | |
| parent | bbdd224c0ad28a77161aeb8c45d34fe0928ef997 (diff) | |
| download | linux-3.10-6e020d8ab8dad5c4ebb5317898d05d437a6f5c49.tar.gz linux-3.10-6e020d8ab8dad5c4ebb5317898d05d437a6f5c49.tar.bz2 linux-3.10-6e020d8ab8dad5c4ebb5317898d05d437a6f5c49.zip | |
ipv4: fib_semantics: increment fib_info_cnt after fib_info allocation
[ 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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/fib_semantics.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c index 8f6cb7a87cd..9c3979a5080 100644 --- a/net/ipv4/fib_semantics.c +++ b/net/ipv4/fib_semantics.c @@ -818,13 +818,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; |