39 lines
1.1 KiB
Diff
39 lines
1.1 KiB
Diff
From: Jiri Pirko <jpirko@redhat.com>
|
|
Date: Thu, 17 Nov 2011 06:32:37 +0000
|
|
Subject: [07/23] team: replace kmalloc+memcpy by kmemdup
|
|
|
|
commit f8a15af093b19b86d56933c8757cee298d0f32a8 upstream.
|
|
|
|
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/team/team.c | 8 ++------
|
|
1 file changed, 2 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
|
|
index c48ef19..064155d 100644
|
|
--- a/drivers/net/team/team.c
|
|
+++ b/drivers/net/team/team.c
|
|
@@ -104,19 +104,15 @@ int team_options_register(struct team *team,
|
|
if (!dst_opts)
|
|
return -ENOMEM;
|
|
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) {
|
|
+ dst_opts[i] = kmemdup(option, sizeof(*option), GFP_KERNEL);
|
|
+ if (!dst_opts[i]) {
|
|
err = -ENOMEM;
|
|
goto rollback;
|
|
}
|
|
- memcpy(dst_opt, option, sizeof(*option));
|
|
- dst_opts[i] = dst_opt;
|
|
}
|
|
|
|
for (i = 0; i < option_count; i++)
|