diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-31 14:59:59 +0200 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-31 14:59:59 +0200 |
| commit | b1b934d31d8a608fe69fc56d6e539548b55b0601 (patch) | |
| tree | e8206589759c732a3a9b70b3feeb9ef50dc3c6b3 /net/bridge/br_ioctl.c | |
| parent | [GFS2] Fix bug in clear_inode (diff) | |
| parent | Linux v2.6.18-rc3 (diff) | |
| download | linux-b1b934d31d8a608fe69fc56d6e539548b55b0601.tar.xz linux-b1b934d31d8a608fe69fc56d6e539548b55b0601.zip | |
Merge branch 'master'
Diffstat (limited to 'net/bridge/br_ioctl.c')
| -rw-r--r-- | net/bridge/br_ioctl.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/bridge/br_ioctl.c b/net/bridge/br_ioctl.c index 159fb8409824..4e4119a12139 100644 --- a/net/bridge/br_ioctl.c +++ b/net/bridge/br_ioctl.c @@ -162,12 +162,10 @@ static int old_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) if (num > BR_MAX_PORTS) num = BR_MAX_PORTS; - indices = kmalloc(num*sizeof(int), GFP_KERNEL); + indices = kcalloc(num, sizeof(int), GFP_KERNEL); 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; @@ -327,11 +325,10 @@ static int old_deviceless(void __user *uarg) if (args[2] >= 2048) return -ENOMEM; - indices = kmalloc(args[2]*sizeof(int), GFP_KERNEL); + indices = kcalloc(args[2], sizeof(int), GFP_KERNEL); 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)) |