diff options
| author | Jiri Pirko <jpirko@redhat.com> | 2011-11-17 04:16:05 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-11-18 14:55:00 -0500 |
| commit | 2bba19fff8d09bf19df5d5e2de7188d65de67c3e (patch) | |
| tree | 5b5a33cce321222efde828d282fd40f0b79a215a /drivers/net/team | |
| parent | 234a8fd49d086f5a3debb379bfdf4e6b51f0c0e2 (diff) | |
| download | linux-2bba19fff8d09bf19df5d5e2de7188d65de67c3e.tar.bz2 | |
team: avoid using variable-length array
Apparently using variable-length array is not correct
(https://lkml.org/lkml/2011/10/23/25). So remove it.
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/team')
| -rw-r--r-- | drivers/net/team/team.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c index 5b169c18aaf6..c48ef19cac13 100644 --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c @@ -96,10 +96,13 @@ int team_options_register(struct team *team, size_t option_count) { int i; - struct team_option *dst_opts[option_count]; + struct team_option **dst_opts; int err; - memset(dst_opts, 0, sizeof(dst_opts)); + dst_opts = kzalloc(sizeof(struct team_option *) * option_count, + GFP_KERNEL); + if (!dst_opts) + return -ENOMEM; for (i = 0; i < option_count; i++, option++) { struct team_option *dst_opt; @@ -119,12 +122,14 @@ int team_options_register(struct team *team, for (i = 0; i < option_count; i++) list_add_tail(&dst_opts[i]->list, &team->option_list); + kfree(dst_opts); return 0; rollback: for (i = 0; i < option_count; i++) kfree(dst_opts[i]); + kfree(dst_opts); return err; } |