From 5620ba75611f94869d2950ab9a59bfce6bd6124a Mon Sep 17 00:00:00 2001 From: "Mihail Semenyako (mike.dld)" Date: Fri, 3 Oct 2008 05:50:39 +0000 Subject: [PATCH] Fixed network stack crash in stateTCB_FIN_WAIT_2 (page fault), trunk + all branches git-svn-id: svn://kolibrios.org@871 a494cfbc-eb01-0410-851d-a64ba20cac60 --- kernel/branches/gfx_kernel/network/tcp.inc | 1 + kernel/branches/gfx_kernel/vmode/clipping.asm | 0 kernel/branches/gfx_kernel/vmode/clipping.inc | 0 kernel/branches/gfx_kernel/vmode/makefile | 0 kernel/branches/gfx_kernel/vmode/norm_04.inc | 0 kernel/branches/gfx_kernel/vmode/norm_08.inc | 0 kernel/branches/gfx_kernel/vmode/norm_15.inc | 0 kernel/branches/gfx_kernel/vmode/norm_16.inc | 0 kernel/branches/gfx_kernel/vmode/norm_24.inc | 0 kernel/branches/gfx_kernel/vmode/norm_32.inc | 0 kernel/branches/gfx_kernel/vmode/normal.asm | 0 kernel/branches/gfx_kernel/vmode/normal.inc | 0 kernel/branches/gfx_kernel/vmode/struct.inc | 0 kernel/branches/gfx_kernel/vmode/vmode.asm | 0 kernel/branches/gfx_kernel/vmode/vmode.txt | 0 kernel/branches/hd_kolibri/kernel/network/tcp.inc | 1 + kernel/branches/kolibri_pe/network/tcp.inc | 1 + kernel/trunk/network/tcp.inc | 1 + 18 files changed, 4 insertions(+) mode change 100755 => 100644 kernel/branches/gfx_kernel/vmode/clipping.asm mode change 100755 => 100644 kernel/branches/gfx_kernel/vmode/clipping.inc mode change 100755 => 100644 kernel/branches/gfx_kernel/vmode/makefile mode change 100755 => 100644 kernel/branches/gfx_kernel/vmode/norm_04.inc mode change 100755 => 100644 kernel/branches/gfx_kernel/vmode/norm_08.inc mode change 100755 => 100644 kernel/branches/gfx_kernel/vmode/norm_15.inc mode change 100755 => 100644 kernel/branches/gfx_kernel/vmode/norm_16.inc mode change 100755 => 100644 kernel/branches/gfx_kernel/vmode/norm_24.inc mode change 100755 => 100644 kernel/branches/gfx_kernel/vmode/norm_32.inc mode change 100755 => 100644 kernel/branches/gfx_kernel/vmode/normal.asm mode change 100755 => 100644 kernel/branches/gfx_kernel/vmode/normal.inc mode change 100755 => 100644 kernel/branches/gfx_kernel/vmode/struct.inc mode change 100755 => 100644 kernel/branches/gfx_kernel/vmode/vmode.asm mode change 100755 => 100644 kernel/branches/gfx_kernel/vmode/vmode.txt diff --git a/kernel/branches/gfx_kernel/network/tcp.inc b/kernel/branches/gfx_kernel/network/tcp.inc index aae99c63a3..7ffe7bfcaa 100644 --- a/kernel/branches/gfx_kernel/network/tcp.inc +++ b/kernel/branches/gfx_kernel/network/tcp.inc @@ -1220,6 +1220,7 @@ stfw2_notlocal: ; Only delete the socket if we received the FIN + mov edx, [sktAddr] mov bl, [edx + 33] and bl, 0x01 cmp bl, 0x01 diff --git a/kernel/branches/gfx_kernel/vmode/clipping.asm b/kernel/branches/gfx_kernel/vmode/clipping.asm old mode 100755 new mode 100644 diff --git a/kernel/branches/gfx_kernel/vmode/clipping.inc b/kernel/branches/gfx_kernel/vmode/clipping.inc old mode 100755 new mode 100644 diff --git a/kernel/branches/gfx_kernel/vmode/makefile b/kernel/branches/gfx_kernel/vmode/makefile old mode 100755 new mode 100644 diff --git a/kernel/branches/gfx_kernel/vmode/norm_04.inc b/kernel/branches/gfx_kernel/vmode/norm_04.inc old mode 100755 new mode 100644 diff --git a/kernel/branches/gfx_kernel/vmode/norm_08.inc b/kernel/branches/gfx_kernel/vmode/norm_08.inc old mode 100755 new mode 100644 diff --git a/kernel/branches/gfx_kernel/vmode/norm_15.inc b/kernel/branches/gfx_kernel/vmode/norm_15.inc old mode 100755 new mode 100644 diff --git a/kernel/branches/gfx_kernel/vmode/norm_16.inc b/kernel/branches/gfx_kernel/vmode/norm_16.inc old mode 100755 new mode 100644 diff --git a/kernel/branches/gfx_kernel/vmode/norm_24.inc b/kernel/branches/gfx_kernel/vmode/norm_24.inc old mode 100755 new mode 100644 diff --git a/kernel/branches/gfx_kernel/vmode/norm_32.inc b/kernel/branches/gfx_kernel/vmode/norm_32.inc old mode 100755 new mode 100644 diff --git a/kernel/branches/gfx_kernel/vmode/normal.asm b/kernel/branches/gfx_kernel/vmode/normal.asm old mode 100755 new mode 100644 diff --git a/kernel/branches/gfx_kernel/vmode/normal.inc b/kernel/branches/gfx_kernel/vmode/normal.inc old mode 100755 new mode 100644 diff --git a/kernel/branches/gfx_kernel/vmode/struct.inc b/kernel/branches/gfx_kernel/vmode/struct.inc old mode 100755 new mode 100644 diff --git a/kernel/branches/gfx_kernel/vmode/vmode.asm b/kernel/branches/gfx_kernel/vmode/vmode.asm old mode 100755 new mode 100644 diff --git a/kernel/branches/gfx_kernel/vmode/vmode.txt b/kernel/branches/gfx_kernel/vmode/vmode.txt old mode 100755 new mode 100644 diff --git a/kernel/branches/hd_kolibri/kernel/network/tcp.inc b/kernel/branches/hd_kolibri/kernel/network/tcp.inc index c759def8e7..7efe8833ab 100644 --- a/kernel/branches/hd_kolibri/kernel/network/tcp.inc +++ b/kernel/branches/hd_kolibri/kernel/network/tcp.inc @@ -1224,6 +1224,7 @@ stfw2_notlocal: ; Only delete the socket if we received the FIN + mov edx, [sktAddr] mov bl, [edx + 33] and bl, 0x01 cmp bl, 0x01 diff --git a/kernel/branches/kolibri_pe/network/tcp.inc b/kernel/branches/kolibri_pe/network/tcp.inc index a5cb519cdf..9b88503983 100644 --- a/kernel/branches/kolibri_pe/network/tcp.inc +++ b/kernel/branches/kolibri_pe/network/tcp.inc @@ -1226,6 +1226,7 @@ stfw2_notlocal: ; Only delete the socket if we received the FIN + mov edx, [sktAddr] mov bl, [edx + 33] and bl, 0x01 cmp bl, 0x01 diff --git a/kernel/trunk/network/tcp.inc b/kernel/trunk/network/tcp.inc index a5cb519cdf..9b88503983 100644 --- a/kernel/trunk/network/tcp.inc +++ b/kernel/trunk/network/tcp.inc @@ -1226,6 +1226,7 @@ stfw2_notlocal: ; Only delete the socket if we received the FIN + mov edx, [sktAddr] mov bl, [edx + 33] and bl, 0x01 cmp bl, 0x01