190 lines
5.6 KiB
Diff
190 lines
5.6 KiB
Diff
From: Jiri Pirko <jpirko@redhat.com>
|
|
Date: Wed, 16 Nov 2011 11:09:09 +0000
|
|
Subject: [04/23] team: replicate options on register
|
|
|
|
commit 358b838291f618278080bbed435b755f9b46748e upstream.
|
|
|
|
Since multiple team instances are putting defined options into their
|
|
option list, during register each option must be cloned before added
|
|
into list. This resolves uncool memory corruptions when using multiple
|
|
teams.
|
|
|
|
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/team/team.c | 76 +++++++++++++++++++++++++----
|
|
drivers/net/team/team_mode_activebackup.c | 5 +-
|
|
include/linux/if_team.h | 8 +--
|
|
3 files changed, 72 insertions(+), 17 deletions(-)
|
|
|
|
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
|
|
index 7db219c..f309274 100644
|
|
--- a/drivers/net/team/team.c
|
|
+++ b/drivers/net/team/team.c
|
|
@@ -80,30 +80,78 @@ EXPORT_SYMBOL(team_port_set_team_mac);
|
|
* Options handling
|
|
*******************/
|
|
|
|
-void team_options_register(struct team *team, struct team_option *option,
|
|
- size_t option_count)
|
|
+struct team_option *__team_find_option(struct team *team, const char *opt_name)
|
|
+{
|
|
+ struct team_option *option;
|
|
+
|
|
+ list_for_each_entry(option, &team->option_list, list) {
|
|
+ if (strcmp(option->name, opt_name) == 0)
|
|
+ return option;
|
|
+ }
|
|
+ return NULL;
|
|
+}
|
|
+
|
|
+int team_options_register(struct team *team,
|
|
+ const struct team_option *option,
|
|
+ size_t option_count)
|
|
{
|
|
int i;
|
|
+ struct team_option *dst_opts[option_count];
|
|
+ int err;
|
|
+
|
|
+ memset(dst_opts, 0, sizeof(dst_opts));
|
|
+ for (i = 0; i < option_count; i++, option++) {
|
|
+ struct team_option *dst_opt;
|
|
+
|
|
+ if (__team_find_option(team, option->name)) {
|
|
+ err = -EEXIST;
|
|
+ goto rollback;
|
|
+ }
|
|
+ dst_opt = kmalloc(sizeof(*option), GFP_KERNEL);
|
|
+ if (!dst_opt) {
|
|
+ err = -ENOMEM;
|
|
+ goto rollback;
|
|
+ }
|
|
+ memcpy(dst_opt, option, sizeof(*option));
|
|
+ dst_opts[i] = dst_opt;
|
|
+ }
|
|
+
|
|
+ for (i = 0; i < option_count; i++)
|
|
+ list_add_tail(&dst_opts[i]->list, &team->option_list);
|
|
|
|
- for (i = 0; i < option_count; i++, option++)
|
|
- list_add_tail(&option->list, &team->option_list);
|
|
+ return 0;
|
|
+
|
|
+rollback:
|
|
+ for (i = 0; i < option_count; i++)
|
|
+ kfree(dst_opts[i]);
|
|
+
|
|
+ return err;
|
|
}
|
|
+
|
|
EXPORT_SYMBOL(team_options_register);
|
|
|
|
static void __team_options_change_check(struct team *team,
|
|
struct team_option *changed_option);
|
|
|
|
static void __team_options_unregister(struct team *team,
|
|
- struct team_option *option,
|
|
+ const struct team_option *option,
|
|
size_t option_count)
|
|
{
|
|
int i;
|
|
|
|
- for (i = 0; i < option_count; i++, option++)
|
|
- list_del(&option->list);
|
|
+ for (i = 0; i < option_count; i++, option++) {
|
|
+ struct team_option *del_opt;
|
|
+
|
|
+ del_opt = __team_find_option(team, option->name);
|
|
+ if (del_opt) {
|
|
+ list_del(&del_opt->list);
|
|
+ kfree(del_opt);
|
|
+ }
|
|
+ }
|
|
}
|
|
|
|
-void team_options_unregister(struct team *team, struct team_option *option,
|
|
+void team_options_unregister(struct team *team,
|
|
+ const struct team_option *option,
|
|
size_t option_count)
|
|
{
|
|
__team_options_unregister(team, option, option_count);
|
|
@@ -632,7 +680,7 @@ static int team_mode_option_set(struct team *team, void *arg)
|
|
return team_change_mode(team, *str);
|
|
}
|
|
|
|
-static struct team_option team_options[] = {
|
|
+static const struct team_option team_options[] = {
|
|
{
|
|
.name = "mode",
|
|
.type = TEAM_OPTION_TYPE_STRING,
|
|
@@ -645,6 +693,7 @@ static int team_init(struct net_device *dev)
|
|
{
|
|
struct team *team = netdev_priv(dev);
|
|
int i;
|
|
+ int err;
|
|
|
|
team->dev = dev;
|
|
mutex_init(&team->lock);
|
|
@@ -660,10 +709,17 @@ static int team_init(struct net_device *dev)
|
|
team_adjust_ops(team);
|
|
|
|
INIT_LIST_HEAD(&team->option_list);
|
|
- team_options_register(team, team_options, ARRAY_SIZE(team_options));
|
|
+ err = team_options_register(team, team_options, ARRAY_SIZE(team_options));
|
|
+ if (err)
|
|
+ goto err_options_register;
|
|
netif_carrier_off(dev);
|
|
|
|
return 0;
|
|
+
|
|
+err_options_register:
|
|
+ free_percpu(team->pcpu_stats);
|
|
+
|
|
+ return err;
|
|
}
|
|
|
|
static void team_uninit(struct net_device *dev)
|
|
diff --git a/drivers/net/team/team_mode_activebackup.c b/drivers/net/team/team_mode_activebackup.c
|
|
index 6fe920c..b344275 100644
|
|
--- a/drivers/net/team/team_mode_activebackup.c
|
|
+++ b/drivers/net/team/team_mode_activebackup.c
|
|
@@ -83,7 +83,7 @@ static int ab_active_port_set(struct team *team, void *arg)
|
|
return -ENOENT;
|
|
}
|
|
|
|
-static struct team_option ab_options[] = {
|
|
+static const struct team_option ab_options[] = {
|
|
{
|
|
.name = "activeport",
|
|
.type = TEAM_OPTION_TYPE_U32,
|
|
@@ -94,8 +94,7 @@ static struct team_option ab_options[] = {
|
|
|
|
int ab_init(struct team *team)
|
|
{
|
|
- team_options_register(team, ab_options, ARRAY_SIZE(ab_options));
|
|
- return 0;
|
|
+ return team_options_register(team, ab_options, ARRAY_SIZE(ab_options));
|
|
}
|
|
|
|
void ab_exit(struct team *team)
|
|
diff --git a/include/linux/if_team.h b/include/linux/if_team.h
|
|
index a6eac12..828181f 100644
|
|
--- a/include/linux/if_team.h
|
|
+++ b/include/linux/if_team.h
|
|
@@ -140,11 +140,11 @@ static inline struct team_port *team_get_port_by_index_rcu(struct team *team,
|
|
}
|
|
|
|
extern int team_port_set_team_mac(struct team_port *port);
|
|
-extern void team_options_register(struct team *team,
|
|
- struct team_option *option,
|
|
- size_t option_count);
|
|
+extern int team_options_register(struct team *team,
|
|
+ const struct team_option *option,
|
|
+ size_t option_count);
|
|
extern void team_options_unregister(struct team *team,
|
|
- struct team_option *option,
|
|
+ const struct team_option *option,
|
|
size_t option_count);
|
|
extern int team_mode_register(struct team_mode *mode);
|
|
extern int team_mode_unregister(struct team_mode *mode);
|