提交 b1a98bf6 编写于 作者: A Arnaldo Carvalho de Melo 提交者: David S. Miller

[NET] neighbour: Use kmemdup where applicable

Signed-off-by: NArnaldo Carvalho de Melo <acme@mandriva.com>
上级 2afe37cd
...@@ -1266,10 +1266,9 @@ void pneigh_enqueue(struct neigh_table *tbl, struct neigh_parms *p, ...@@ -1266,10 +1266,9 @@ void pneigh_enqueue(struct neigh_table *tbl, struct neigh_parms *p,
struct neigh_parms *neigh_parms_alloc(struct net_device *dev, struct neigh_parms *neigh_parms_alloc(struct net_device *dev,
struct neigh_table *tbl) struct neigh_table *tbl)
{ {
struct neigh_parms *p = kmalloc(sizeof(*p), GFP_KERNEL); struct neigh_parms *p = kmemdup(&tbl->parms, sizeof(*p), GFP_KERNEL);
if (p) { if (p) {
memcpy(p, &tbl->parms, sizeof(*p));
p->tbl = tbl; p->tbl = tbl;
atomic_set(&p->refcnt, 1); atomic_set(&p->refcnt, 1);
INIT_RCU_HEAD(&p->rcu_head); INIT_RCU_HEAD(&p->rcu_head);
...@@ -2625,14 +2624,14 @@ int neigh_sysctl_register(struct net_device *dev, struct neigh_parms *p, ...@@ -2625,14 +2624,14 @@ int neigh_sysctl_register(struct net_device *dev, struct neigh_parms *p,
int p_id, int pdev_id, char *p_name, int p_id, int pdev_id, char *p_name,
proc_handler *handler, ctl_handler *strategy) proc_handler *handler, ctl_handler *strategy)
{ {
struct neigh_sysctl_table *t = kmalloc(sizeof(*t), GFP_KERNEL); struct neigh_sysctl_table *t = kmemdup(&neigh_sysctl_template,
sizeof(*t), GFP_KERNEL);
const char *dev_name_source = NULL; const char *dev_name_source = NULL;
char *dev_name = NULL; char *dev_name = NULL;
int err = 0; int err = 0;
if (!t) if (!t)
return -ENOBUFS; return -ENOBUFS;
memcpy(t, &neigh_sysctl_template, sizeof(*t));
t->neigh_vars[0].data = &p->mcast_probes; t->neigh_vars[0].data = &p->mcast_probes;
t->neigh_vars[1].data = &p->ucast_probes; t->neigh_vars[1].data = &p->ucast_probes;
t->neigh_vars[2].data = &p->app_probes; t->neigh_vars[2].data = &p->app_probes;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册