Egor00f/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

[KERNEL] Attempt to fix unexpected stack state

Browse Source 
git-svn-id: svn://kolibrios.org@9807 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Magomed Kostoev (mkostoevr) 2022-05-05 15:47:56 +00:00
parent 2543e89522
commit 68d6fe5255
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/trunk/network/IPv4.inc
View File

@ -508,6 +508,8 @@ ipv4_input:
je .destroy_slot_pop ; If we dont have enough space to allocate the buffer, discard all packets in slot je .destroy_slot_pop ; If we dont have enough space to allocate the buffer, discard all packets in slot
mov edx, [esp+4] ; Get pointer to first fragment entry back in edx mov edx, [esp+4] ; Get pointer to first fragment entry back in edx
; FIXME: We should create NET_BUFF in eax instead of a rugular buffer with IP packet
.rebuild_packet_loop: .rebuild_packet_loop:
movzx ecx, [edx + sizeof.NET_BUFF + sizeof.IPv4_FRAGMENT_entry + IPv4_header.FlagsAndFragmentOffset] ; Calculate the fragment offset movzx ecx, [edx + sizeof.NET_BUFF + sizeof.IPv4_FRAGMENT_entry + IPv4_header.FlagsAndFragmentOffset] ; Calculate the fragment offset
xchg cl, ch ; intel byte order xchg cl, ch ; intel byte order
@ -556,11 +558,11 @@ ipv4_input:
xchg cl, ch xchg cl, ch
mov edx, eax mov edx, eax
mov [edx + IPv4_header.TotalLength], cx mov [edx + IPv4_header.TotalLength], cx
add esp, 12 add esp, 8 ; Remove pointer to first buffer and pointer to last buffer from the stack
xchg cl, ch xchg cl, ch
push ecx edx ; size and pointer push edx ; Push pointer to the new buffer with full IP packet
mov edi, [edi_saved] mov edi, [edi_saved]
jmp .handle_it ; edx = buf ptr, ecx = size, [esp] buf ptr, [esp+4], total size, ebx=device ptr jmp .handle_it ; edx = buf ptr, ecx = size, [esp] buf ptr, ebx=device ptr
.destroy_slot_pop: .destroy_slot_pop:
add esp, 4 add esp, 4