patch-2.4.0-test11 linux/net/bridge/br_ioctl.c

• Lines: 50
• Date: Thu Nov 9 15:57:53 2000
• Orig file: v2.4.0-test10/linux/net/bridge/br_ioctl.c
• Orig date: Tue Oct 31 12:42:27 2000

diff -u --recursive --new-file v2.4.0-test10/linux/net/bridge/br_ioctl.c linux/net/bridge/br_ioctl.c
@@ -5,7 +5,7 @@
  *	Authors:
  *	Lennert Buytenhek		<buytenh@gnu.org>
  *
- *	$Id: br_ioctl.c,v 1.3 2000/10/05 01:58:16 davem Exp $
+ *	$Id: br_ioctl.c,v 1.4 2000/11/08 05:16:40 davem Exp $
  *
  *	This program is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU General Public License
@@ -53,6 +53,7 @@
 	{
 		struct __bridge_info b;
 
+		memset(&b, 0, sizeof(struct __bridge_info));
 		memcpy(&b.designated_root, &br->designated_root, 8);
 		memcpy(&b.bridge_id, &br->bridge_id, 8);
 		b.root_path_cost = br->root_path_cost;
@@ -81,8 +82,12 @@
 
 	case BRCTL_GET_PORT_LIST:
 	{
+		int i;
 		int indices[256];
 
+		for (i=0;i<256;i++)
+			indices[i] = 0;
+
 		br_get_port_ifindices(br, indices);
 		if (copy_to_user((void *)arg0, indices, 256*sizeof(int)))
 			return -EFAULT;
@@ -124,6 +129,7 @@
 		if ((pt = br_get_port(br, arg1)) == NULL)
 			return -EINVAL;
 
+		memset(&p, 0, sizeof(struct __port_info));
 		memcpy(&p.designated_root, &pt->designated_root, 8);
 		memcpy(&p.designated_bridge, &pt->designated_bridge, 8);
 		p.port_id = pt->port_id;
@@ -189,7 +195,11 @@
 
 	case BRCTL_GET_BRIDGES:
 	{
+		int i;
 		int indices[64];
+
+		for (i=0;i<64;i++)
+			indices[i] = 0;
 
 		if (arg1 > 64)
 			arg1 = 64;