AMajor/SoftEtherVPN
1
0
Fork 0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2024-11-23 01:49:53 +03:00
Code Releases Activity

Compare commits

base: AMajor:d80ea78ff68bd442349692e9a8a9e0e21fc3065f
Branches Tags
AMajor:master
AMajor:5.02.5187
AMajor:5.02.5186
AMajor:5.02.5185
AMajor:5.02.5184
AMajor:5.02.5183
AMajor:5.02.5182
AMajor:5.02.5181
AMajor:5.02.5180
AMajor:5.02.0
AMajor:5.01.9674
AMajor:5.01.9673
AMajor:5.01.9672
AMajor:5.01.9671
AMajor:5.01.9670
AMajor:5.01.9669
AMajor:5.01.9668
AMajor:5.01.9667
AMajor:5.01.9666
AMajor:5.01.9665
AMajor:5.01.9664
AMajor:5.01.9663
AMajor:5.01.9662
AMajor:5.01.9661
AMajor:5.01.9660
AMajor:5.01.9659
AMajor:5.01.9658
...
compare: AMajor:8650c38dff5bd1eb48dc00b869a5789ee8743239
Branches Tags
AMajor:master
AMajor:5.02.5187
AMajor:5.02.5186
AMajor:5.02.5185
AMajor:5.02.5184
AMajor:5.02.5183
AMajor:5.02.5182
AMajor:5.02.5181
AMajor:5.02.5180
AMajor:5.02.0
AMajor:5.01.9674
AMajor:5.01.9673
AMajor:5.01.9672
AMajor:5.01.9671
AMajor:5.01.9670
AMajor:5.01.9669
AMajor:5.01.9668
AMajor:5.01.9667
AMajor:5.01.9666
AMajor:5.01.9665
AMajor:5.01.9664
AMajor:5.01.9663
AMajor:5.01.9662
AMajor:5.01.9661
AMajor:5.01.9660
AMajor:5.01.9659
AMajor:5.01.9658

4 Commits
d80ea78ff6 ... 8650c38dff

Author SHA1 Message Date
panakuma
8650c38dff
Merge f8c5fa5384 into 9ce27f363e 2024-04-29 21:39:20 +03:00
Ilya Shipitsin
9ce27f363e
Merge pull request #1990 from SoftEtherVPN/fix1972 
Fix memory access error when IPv6 prefix reading, should resolve #1972
 2024-04-28 17:25:16 +02:00
Evengard
d568cc1727 Fix another memory access error again because of a missing MAC address in IPv6 headers 2024-04-27 21:57:36 +03:00
Evengard
c9b5e25c87 Fix memory access error when IPv6 prefix reading, should resolve #1972 2024-04-27 02:01:48 +03:00
1 changed files with 12 additions and 3 deletions
Show Stats Expand all files Collapse all files

15
src/Cedar/IPC.c
View File

@ -1517,7 +1517,9 @@ void IPCProcessL3EventsEx(IPC *ipc, UINT64 now)
// We save the router advertisement data for later use // We save the router advertisement data for later use
IPCIPv6AddRouterPrefixes(ipc, &p->ICMPv6HeaderPacketInfo.OptionList, src_mac, &ip_src); IPCIPv6AddRouterPrefixes(ipc, &p->ICMPv6HeaderPacketInfo.OptionList, src_mac, &ip_src);
IPCIPv6AssociateOnNDTEx(ipc, &ip_src, src_mac, true); IPCIPv6AssociateOnNDTEx(ipc, &ip_src, src_mac, true);
IPCIPv6AssociateOnNDTEx(ipc, &ip_src, p->ICMPv6HeaderPacketInfo.OptionList.SourceLinkLayer->Address, true); if (p->ICMPv6HeaderPacketInfo.OptionList.SourceLinkLayer != NULL) {
IPCIPv6AssociateOnNDTEx(ipc, &ip_src, p->ICMPv6HeaderPacketInfo.OptionList.SourceLinkLayer->Address, true);
}
ndtProcessed = true; ndtProcessed = true;
header_size = sizeof(ICMPV6_ROUTER_ADVERTISEMENT_HEADER); header_size = sizeof(ICMPV6_ROUTER_ADVERTISEMENT_HEADER);
break; break;
@ -2354,7 +2356,14 @@ void IPCIPv6AddRouterPrefixes(IPC *ipc, ICMPV6_OPTION_LIST *recvPrefix, UCHAR *m
IntToSubnetMask6(&newRA->RoutedMask, recvPrefix->Prefix[i]->SubnetLength); IntToSubnetMask6(&newRA->RoutedMask, recvPrefix->Prefix[i]->SubnetLength);
CopyIP(&newRA->RouterAddress, ip); CopyIP(&newRA->RouterAddress, ip);
Copy(newRA->RouterMacAddress, macAddress, 6); Copy(newRA->RouterMacAddress, macAddress, 6);
Copy(newRA->RouterLinkLayerAddress, recvPrefix->SourceLinkLayer->Address, 6); if (recvPrefix->SourceLinkLayer != NULL)
{
Copy(newRA->RouterLinkLayerAddress, recvPrefix->SourceLinkLayer->Address, 6);
}
else
{
Zero(newRA->RouterLinkLayerAddress, 6);
}
Add(ipc->IPv6RouterAdvs, newRA); Add(ipc->IPv6RouterAdvs, newRA);
} }
} }
@ -2657,7 +2666,7 @@ void IPCIPv6SendUnicast(IPC *ipc, void *data, UINT size, IP *next_ip)
} }
destMac = ra.RouterMacAddress; destMac = ra.RouterMacAddress;
if (!IsMacUnicast(destMac) && !IsMacInvalid(ra.RouterMacAddress)) if (!IsMacUnicast(destMac) && !IsMacInvalid(ra.RouterLinkLayerAddress))
{ {
destMac = ra.RouterLinkLayerAddress; destMac = ra.RouterLinkLayerAddress;
} }