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
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
net
/
sched
/
act_api.c
diff --git
a/net/sched/act_api.c
b/net/sched/act_api.c
index
a2587b5
..
ea7e0fe
100644
(file)
--- a/
net/sched/act_api.c
+++ b/
net/sched/act_api.c
@@
-14,6
+14,7
@@
#include <asm/uaccess.h>
#include <asm/system.h>
#include <linux/bitops.h>
#include <asm/uaccess.h>
#include <asm/system.h>
#include <linux/bitops.h>
+#include <linux/config.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/sched.h>
@@
-312,9
+313,10
@@
struct tc_action *tcf_action_init_1(struct rtattr *rta, struct rtattr *est,
}
*err = -ENOMEM;
}
*err = -ENOMEM;
- a = k
z
alloc(sizeof(*a), GFP_KERNEL);
+ a = k
m
alloc(sizeof(*a), GFP_KERNEL);
if (a == NULL)
goto err_mod;
if (a == NULL)
goto err_mod;
+ memset(a, 0, sizeof(*a));
/* backward compatibility for policer */
if (name == NULL)
/* backward compatibility for policer */
if (name == NULL)
@@
-491,9
+493,10
@@
tcf_action_get_1(struct rtattr *rta, struct nlmsghdr *n, u32 pid, int *err)
index = *(int *)RTA_DATA(tb[TCA_ACT_INDEX - 1]);
*err = -ENOMEM;
index = *(int *)RTA_DATA(tb[TCA_ACT_INDEX - 1]);
*err = -ENOMEM;
- a = k
z
alloc(sizeof(struct tc_action), GFP_KERNEL);
+ a = k
m
alloc(sizeof(struct tc_action), GFP_KERNEL);
if (a == NULL)
return NULL;
if (a == NULL)
return NULL;
+ memset(a, 0, sizeof(struct tc_action));
*err = -EINVAL;
a->ops = tc_lookup_action(tb[TCA_ACT_KIND - 1]);
*err = -EINVAL;
a->ops = tc_lookup_action(tb[TCA_ACT_KIND - 1]);
@@
-529,11
+532,12
@@
static struct tc_action *create_a(int i)
{
struct tc_action *act;
{
struct tc_action *act;
- act = k
z
alloc(sizeof(*act), GFP_KERNEL);
+ act = k
m
alloc(sizeof(*act), GFP_KERNEL);
if (act == NULL) {
printk("create_a: failed to alloc!\n");
return NULL;
}
if (act == NULL) {
printk("create_a: failed to alloc!\n");
return NULL;
}
+ memset(act, 0, sizeof(*act));
act->order = i;
return act;
}
act->order = i;
return act;
}