patch-2.1.4 linux/net/bridge/br.c

Next file: linux/net/core/datagram.c
Previous file: linux/net/ax25/ax25_route.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.3/linux/net/bridge/br.c linux/net/bridge/br.c
@@ -1448,7 +1448,7 @@
 				return err;
 			memcpy(&br_stats.bridge_data, &bridge_info, sizeof(Bridge_data));
 			memcpy(&br_stats.port_data, &port_info, sizeof(Port_data)*No_of_ports);
-			memcpy_tofs(arg, &br_stats, sizeof(struct br_stat));
+			copy_to_user(arg, &br_stats, sizeof(struct br_stat));
 			return(0);
 		case SIOCSIFBR:
 			if (!suser())
@@ -1457,7 +1457,7 @@
 				sizeof(struct br_cf));
 			if(err)
 				return err;
-			memcpy_fromfs(&bcf, arg, sizeof(struct br_cf));
+			copy_from_user(&bcf, arg, sizeof(struct br_cf));
 			switch (bcf.cmd) {
 				case BRCMD_BRIDGE_ENABLE:
 					if (br_stats.flags & BR_UP)

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov