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
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
net
/
bridge
/
br_ioctl.c
diff --git
a/net/bridge/br_ioctl.c
b/net/bridge/br_ioctl.c
index
0d5b0d1
..
4c61a7e
100644
(file)
--- a/
net/bridge/br_ioctl.c
+++ b/
net/bridge/br_ioctl.c
@@
-163,12
+163,10
@@
static int old_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
if (num > BR_MAX_PORTS)
num = BR_MAX_PORTS;
if (num > BR_MAX_PORTS)
num = BR_MAX_PORTS;
- indices = k
malloc(num*
sizeof(int), GFP_KERNEL);
+ indices = k
calloc(num,
sizeof(int), GFP_KERNEL);
if (indices == NULL)
return -ENOMEM;
if (indices == NULL)
return -ENOMEM;
- memset(indices, 0, num*sizeof(int));
-
get_port_ifindices(br, indices, num);
if (copy_to_user((void __user *)args[1], indices, num*sizeof(int)))
num = -EFAULT;
get_port_ifindices(br, indices, num);
if (copy_to_user((void __user *)args[1], indices, num*sizeof(int)))
num = -EFAULT;
@@
-328,11
+326,10
@@
static int old_deviceless(void __user *uarg)
if (args[2] >= 2048)
return -ENOMEM;
if (args[2] >= 2048)
return -ENOMEM;
- indices = k
malloc(args[2]*
sizeof(int), GFP_KERNEL);
+ indices = k
calloc(args[2],
sizeof(int), GFP_KERNEL);
if (indices == NULL)
return -ENOMEM;
if (indices == NULL)
return -ENOMEM;
- memset(indices, 0, args[2]*sizeof(int));
args[2] = get_bridge_ifindices(indices, args[2]);
ret = copy_to_user((void __user *)args[1], indices, args[2]*sizeof(int))
args[2] = get_bridge_ifindices(indices, args[2]);
ret = copy_to_user((void __user *)args[1], indices, args[2]*sizeof(int))