Frag dev pull request #284

laurensmiers · 2015-06-18T17:23:09Z

This should fix #246 . Asan does not complain anymore + udp frag test in autotest.h is succeeding (with asan).
Tahi ipv6 fragmentation tests, Test v6LC.1.3.1/2/3/4, are also succeeding.
Requesting review.

…eanup out of arrive function + copy all pico net headers in reassambled frame + add pico device to reassambled frame + update payload lengths in reassambled frame

…rrect frame->transport_len, ... when copying frame

…ree + altered compare functions in case of NULL

…t_arrived

Solved Conflicts: Makefile modules/pico_ipv4.c

danielinux · 2015-06-18T21:39:47Z

@laurensmiers : I right-merged from last development and fixed some warnings. I ran tics showcase and the results are optimal 👍

There is one unit test failing though, please investigate.

Reproduce:

make ARCH=faulty units
./build/test/modunit_fragments.elf 
*** Error in `./build/test/modunit_fragments.elf': free(): corrupted unsorted chunks: 0x089db330 ***
84%: Checks: 13, Failures: 1, Errors: 1
test/unit/modunit_pico_fragments.c:275:E:Unit test for pico_fragment_arrived:tc_pico_fragment_arrived:0: (after this point) Received signal 6 (Aborted)
test/unit/modunit_pico_fragments.c:388:F:Unit test for copy_ipv6_hdrs_nofrag:tc_copy_ipv6_hdrs_nofrag:0: Assertion 'copy_ipv6_hdrs_nofrag(dst, src) == src->net_len - 8' failed

make ADDRESS_SANITIZER=1 ARCH=faulty units
./build/test/modunit_fragments.elf 
Running suite(s): PicoTCP
=================================================================
==9427==ERROR: AddressSanitizer: heap-buffer-overflow on address 0xb5c00c26 at pc 0x804e3a2 bp 0xbffb3b58 sp 0xbffb3b4c
WRITE of size 1 at 0xb5c00c26 thread T0
    #0 0x804e3a1 in pico_fragment_arrived modules/pico_fragments.c:903
    #1 0x80505bf in tc_pico_fragment_arrived test/unit/modunit_pico_fragments.c:263
    #2 0x80549b1 in srunner_run (/home/dan/picotcp/build/test/modunit_fragments.elf+0x80549b1)
    #3 0x8054a66 in srunner_run_all (/home/dan/picotcp/build/test/modunit_fragments.elf+0x8054a66)
    #4 0x8052053 in main test/unit/modunit_pico_fragments.c:488
    #5 0xb7029a62 in __libc_start_main (/lib/i386-linux-gnu/i686/cmov/libc.so.6+0x19a62)
    #6 0x8049660 (/home/dan/picotcp/build/test/modunit_fragments.elf+0x8049660)

0xb5c00c26 is located 10 bytes to the left of 8-byte region [0xb5c00c30,0xb5c00c38)
allocated by thread T0 here:
    #0 0xb7275812 in __interceptor_calloc (/usr/lib/i386-linux-gnu/libasan.so.1+0x4e812)
    #1 0x8049b51 in pico_zalloc include/../test/pico_faulty.h:72
    #2 0x804cdd8 in pico_hole_alloc modules/pico_fragments.c:652
    #3 0x804e7d7 in pico_fragment_arrived modules/pico_fragments.c:954
    #4 0x8050024 in tc_pico_fragment_arrived test/unit/modunit_pico_fragments.c:234
    #5 0x80549b1 in srunner_run (/home/dan/picotcp/build/test/modunit_fragments.elf+0x80549b1)

SUMMARY: AddressSanitizer: heap-buffer-overflow modules/pico_fragments.c:903 pico_fragment_arrived
Shadow bytes around the buggy address:
  0x36b80130: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa
  0x36b80140: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa
  0x36b80150: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa
  0x36b80160: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa
  0x36b80170: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa
=>0x36b80180: fa fa 00 02[fa]fa 00 fa fa fa fd fa fa fa fd fa
  0x36b80190: fa fa fd fa fa fa fd fd fa fa 00 04 fa fa fd fa
  0x36b801a0: fa fa fd fa fa fa 07 fa fa fa fd fa fa fa 07 fa
  0x36b801b0: fa fa fd fa fa fa fd fd fa fa 07 fa fa fa fd fa
  0x36b801c0: fa fa fd fa fa fa 07 fa fa fa fd fa fa fa 07 fa
  0x36b801d0: fa fa fd fa fa fa 00 00 fa fa 04 fa fa fa fd fa
Shadow byte legend (one shadow byte represents 8 application bytes):
  Addressable:           00
  Partially addressable: 01 02 03 04 05 06 07 
  Heap left redzone:       fa
  Heap right redzone:      fb
  Freed heap region:       fd
  Stack left redzone:      f1
  Stack mid redzone:       f2
  Stack right redzone:     f3
  Stack partial redzone:   f4
  Stack after return:      f5
  Stack use after scope:   f8
  Global redzone:          f9
  Global init order:       f6
  Poisoned by user:        f7
  Contiguous container OOB:fc
  ASan internal:           fe
==9427==ABORTING
84%: Checks: 13, Failures: 1, Errors: 1
test/unit/modunit_pico_fragments.c:245:E:Unit test for pico_fragment_arrived:tc_pico_fragment_arrived:0: (after this point) Early exit with return value 1
test/unit/modunit_pico_fragments.c:388:F:Unit test for copy_ipv6_hdrs_nofrag:tc_copy_ipv6_hdrs_nofrag:0: Assertion 'copy_ipv6_hdrs_nofrag(dst, src) == src->net_len - 8' failed

Refactoring of Fragmentation

ludolinux and others added 30 commits April 15, 2015 13:45

first try redesigned frag algo

0d2ae52

some debugging work done, not ready for prime time

6055a46

Added unit test skeleton for new module pico_fragments.c

ac53f0c

more debugging

04dfc29

debugged ipv4, not yet created unit tests

7d20228

cleanup done

134ae68

added checksum calculation

dda5065

fixed address cmps

7bb8891

removed printf

228b477

fixed test

d067d8a

fixed fragment src/dst addr cmp

9999f29

fix for icmp

8618053

fixed copy nxthdr for ipv6

adf150a

added unit test

821b945

fixing frag algo

3315626

checkin work

4dbb4fb

Moved detecting fragment hdr, calc crc, send upstream and fragment cl…

5bd8106

…eanup out of arrive function + copy all pico net headers in reassambled frame + add pico device to reassambled frame + update payload lengths in reassambled frame

Delete trailing whitespaces

6693625

Reduce initial size of fragment buffer to first frame recv

76a748f

Added icmp6 notify if reassemble time is exceeded + some debug info

f6d40e9

Added IP4/6 check before notifying ICMP of timeout

c1e381e

Removed typo

1107cf8

Expanded copy of frame to update all fragment variables

c5f9c98

Fixed frag timeout and frag frame copy

8b9327f

Fixed timeout of frag packets + stub frag header handling

421dc1f

Simplified reallocation of new (frag) frame

107663e

Fixed invalid freeing of frame when using IPv4

ade91c0

Fixed copy of net header when using ipv4 + proper freeing of fragments

1eb1852

Moved check (if fragmented ipv4) before creating fragment struct

bed190c

Fixed ipv4 fragment lookup + updating of total buffer len

a629389

laurensmiers and others added 15 commits June 16, 2015 12:08

Perform check for last fragment after copying recv frame to ensure co…

009a8fd

…rrect frame->transport_len, ... when copying frame

Fixed some compiler warnings

8a35ebd

Fix compiler warnings for gcc bug

9e2c1fa

Cleanup of comments

7337d6c

Fix typo

6e01ca8

Delete trailing whitespace

97a43f6

Moved init of holes to fragment_alloc for consistency with fragment_f…

0586e1a

…ree + altered compare functions in case of NULL

Added unit test for fragment compare and alloc

f6eb741

Added unit test for first_fragment_received

b22cb56

Added unit test for pico_fragment_free

7f6a579

Added unit tests for pico_hole_free/alloc + beginnign of pico_fragmen…

d5d2299

…t_arrived

Added unit test for pico_fragments

71058e8

Fix some compiler warnings + disable debug info

83501b4

Merge branch 'development' into frag_dev

f964666

Solved Conflicts: Makefile modules/pico_ipv4.c

Fixed compiler warnings. Fixed non-ipv6 build.

4a69e13

laurens and others added 9 commits June 19, 2015 08:32

Fix for unit test of copy_ipv6_hdrs_nofrag

79b2848

Added "pico_frame_grow"

6e9283b

Update headers for new buffer

4644ee9

Using pico_frame_grow fixes pico_fragments tests

7140069

Improved "pico_frame_grow"

3d66a00

Fix compiler warnings in fragments

ea9cb64

Update datalink hdr in frame grow and deepcopy

4578069

Added check for proper copying in unit test pico_fragments

107014e

Merge branch 'dev' into frag_dev

242a327

danielinux added a commit that referenced this pull request Jun 19, 2015

Merge pull request #284 from tass-belgium/frag_dev

e7ef870

Refactoring of Fragmentation

danielinux merged commit e7ef870 into development Jun 19, 2015

danielinux deleted the frag_dev branch June 19, 2015 15:21

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Frag dev pull request #284

Frag dev pull request #284

laurensmiers commented Jun 18, 2015

danielinux commented Jun 18, 2015

Frag dev pull request #284

Frag dev pull request #284

Conversation

laurensmiers commented Jun 18, 2015

danielinux commented Jun 18, 2015