diff options
| author | Gonzalo Paniagua Javier <gonzalo.mono@gmail.com> | 2010-07-05 22:30:12 +0400 |
|---|---|---|
| committer | Gonzalo Paniagua Javier <gonzalo.mono@gmail.com> | 2010-07-05 22:30:12 +0400 |
| commit | bb8767c7d429534dcbb4be18f86984cce1987dcd (patch) | |
| tree | 94eef2425e6e740c217e9a944503893dfe3f30d4 /mcs/class | |
| parent | 6174f1d4dee972d4d811770f96a25cc63ffa45dc (diff) | |
2010-07-05 Gonzalo Paniagua Javier <gonzalo@novell.com>
* NetworkInterface.cs: avoid endless loop when a bad length is
received for AF_PACKET.
svn path=/branches/mono-2-6/mcs/; revision=159920
Diffstat (limited to 'mcs/class')
| -rw-r--r-- | mcs/class/System/System.Net.NetworkInformation/ChangeLog | 5 | ||||
| -rw-r--r-- | mcs/class/System/System.Net.NetworkInformation/NetworkInterface.cs | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/mcs/class/System/System.Net.NetworkInformation/ChangeLog b/mcs/class/System/System.Net.NetworkInformation/ChangeLog index a46d48633bf..17a48236db1 100644 --- a/mcs/class/System/System.Net.NetworkInformation/ChangeLog +++ b/mcs/class/System/System.Net.NetworkInformation/ChangeLog @@ -1,3 +1,8 @@ +2010-07-05 Gonzalo Paniagua Javier <gonzalo@novell.com> + + * NetworkInterface.cs: avoid endless loop when a bad length is + received for AF_PACKET. + 2010-06-22 Gonzalo Paniagua Javier <gonzalo@novell.com> * Ping.cs: we need to read the output to give the process time diff --git a/mcs/class/System/System.Net.NetworkInformation/NetworkInterface.cs b/mcs/class/System/System.Net.NetworkInformation/NetworkInterface.cs index 5eefd797ed0..ae9bde75252 100644 --- a/mcs/class/System/System.Net.NetworkInformation/NetworkInterface.cs +++ b/mcs/class/System/System.Net.NetworkInformation/NetworkInterface.cs @@ -272,6 +272,7 @@ namespace System.Net.NetworkInformation { if (((int)sockaddrll.sll_halen) > sockaddrll.sll_addr.Length){ Console.Error.WriteLine ("Got a bad hardware address length for an AF_PACKET {0} {1}", sockaddrll.sll_halen, sockaddrll.sll_addr.Length); + next = addr.ifa_next; continue; } |