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
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
net
/
bridge
/
br_ioctl.c
diff --git
a/net/bridge/br_ioctl.c
b/net/bridge/br_ioctl.c
index
4c61a7e
..
159fb84
100644
(file)
--- a/
net/bridge/br_ioctl.c
+++ b/
net/bridge/br_ioctl.c
@@
-58,13
+58,12
@@
static int get_fdb_entries(struct net_bridge *br, void __user *userbuf,
{
int num;
void *buf;
{
int num;
void *buf;
- size_t size;
+ size_t size
= maxnum * sizeof(struct __fdb_entry)
;
- /* Clamp size to PAGE_SIZE, test maxnum to avoid overflow */
- if (maxnum > PAGE_SIZE/sizeof(struct __fdb_entry))
+ if (size > PAGE_SIZE) {
+ size = PAGE_SIZE;
maxnum = PAGE_SIZE/sizeof(struct __fdb_entry);
maxnum = PAGE_SIZE/sizeof(struct __fdb_entry);
-
- size = maxnum * sizeof(struct __fdb_entry);
+ }
buf = kmalloc(size, GFP_USER);
if (!buf)
buf = kmalloc(size, GFP_USER);
if (!buf)
@@
-163,10
+162,12
@@
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
calloc(num,
sizeof(int), GFP_KERNEL);
+ indices = k
malloc(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;
@@
-326,10
+327,11
@@
static int old_deviceless(void __user *uarg)
if (args[2] >= 2048)
return -ENOMEM;
if (args[2] >= 2048)
return -ENOMEM;
- indices = k
calloc(args[2],
sizeof(int), GFP_KERNEL);
+ indices = k
malloc(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))