* [patch net-next] team: replace kmalloc+memcpy by kmemdup
@ 2011-11-17 16:32 Jiri Pirko
2011-11-18 20:00 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Jiri Pirko @ 2011-11-17 16:32 UTC (permalink / raw)
To: netdev
Cc: davem, eric.dumazet, bhutchings, shemminger, andy, fbl, jzupka,
ivecera
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
---
drivers/net/team/team.c | 8 ++------
1 files 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++)
--
1.7.6
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [patch net-next] team: replace kmalloc+memcpy by kmemdup
2011-11-17 16:32 [patch net-next] team: replace kmalloc+memcpy by kmemdup Jiri Pirko
@ 2011-11-18 20:00 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2011-11-18 20:00 UTC (permalink / raw)
To: jpirko
Cc: netdev, eric.dumazet, bhutchings, shemminger, andy, fbl, jzupka,
ivecera
From: Jiri Pirko <jpirko@redhat.com>
Date: Thu, 17 Nov 2011 17:32:37 +0100
> Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-11-18 20:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-17 16:32 [patch net-next] team: replace kmalloc+memcpy by kmemdup Jiri Pirko
2011-11-18 20:00 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).