git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
net
/
sched
/
em_nbyte.c
diff --git
a/net/sched/em_nbyte.c
b/net/sched/em_nbyte.c
index
cc80bab
..
005db40
100644
(file)
--- a/
net/sched/em_nbyte.c
+++ b/
net/sched/em_nbyte.c
@@
-34,12
+34,10
@@
static int em_nbyte_change(struct tcf_proto *tp, void *data, int data_len,
return -EINVAL;
em->datalen = sizeof(*nbyte) + nbyte->len;
return -EINVAL;
em->datalen = sizeof(*nbyte) + nbyte->len;
- em->data = (unsigned long)
kmalloc(
em->datalen, GFP_KERNEL);
+ em->data = (unsigned long)
kmemdup(data,
em->datalen, GFP_KERNEL);
if (em->data == 0UL)
return -ENOBUFS;
if (em->data == 0UL)
return -ENOBUFS;
- memcpy((void *) em->data, data, em->datalen);
-
return 0;
}
return 0;
}