Skip to content

network: accept NUL character in SendOption= - #14675

Merged
poettering merged 4 commits into
systemd:masterfrom
yuwata:network-dhcp-accept-nul
Jan 28, 2020
Merged

poettering merged 4 commits into
systemd:masterfrom
yuwata:network-dhcp-accept-nul

Conversation

@yuwata

@yuwata yuwata commented Jan 27, 2020 •

Copy link
Copy Markdown
Member

Closes #14609.

@yuwata

yuwata commented Jan 27, 2020

Copy link
Copy Markdown
Member Author

cc @ssahani.

@mrc0mmand

Copy link
Copy Markdown
Member
=================================================================
==51703==ERROR: LeakSanitizer: detected memory leaks

Direct leak of 31 byte(s) in 1 object(s) allocated from:
    #0 0x7f0cf22adaca in __interceptor_malloc /build/gcc/src/gcc/libsanitizer/asan/asan_malloc_linux.cc:144
    #1 0x7f0cf159a2ae in malloc_multiply ../src/basic/alloc-util.h:96
    #2 0x7f0cf159a2ae in cunescape_length_with_prefix ../src/basic/escape.c:303
    #3 0x5562d06ca164 in cunescape_length ../src/basic/escape.h:47
    #4 0x5562d06ca164 in cunescape ../src/basic/escape.h:50
    #5 0x5562d06ca81a in test_cunescape ../src/test/test-escape.c:106
    #6 0x5562d06cb954 in main ../src/test/test-escape.c:176
    #7 0x7f0cf0138152 in __libc_start_main (/lib64/libc.so.6+0x27152)

Direct leak of 19 byte(s) in 1 object(s) allocated from:
    #0 0x7f0cf22adaca in __interceptor_malloc /build/gcc/src/gcc/libsanitizer/asan/asan_malloc_linux.cc:144
    #1 0x7f0cf159a2ae in malloc_multiply ../src/basic/alloc-util.h:96
    #2 0x7f0cf159a2ae in cunescape_length_with_prefix ../src/basic/escape.c:303
    #3 0x5562d06ca164 in cunescape_length ../src/basic/escape.h:47
    #4 0x5562d06ca164 in cunescape ../src/basic/escape.h:50
    #5 0x5562d06ca7bb in test_cunescape ../src/test/test-escape.c:103
    #6 0x5562d06cb954 in main ../src/test/test-escape.c:176
    #7 0x7f0cf0138152 in __libc_start_main (/lib64/libc.so.6+0x27152)

Direct leak of 13 byte(s) in 1 object(s) allocated from:
    #0 0x7f0cf22adaca in __interceptor_malloc /build/gcc/src/gcc/libsanitizer/asan/asan_malloc_linux.cc:144
    #1 0x7f0cf159a2ae in malloc_multiply ../src/basic/alloc-util.h:96
    #2 0x7f0cf159a2ae in cunescape_length_with_prefix ../src/basic/escape.c:303
    #3 0x5562d06ca164 in cunescape_length ../src/basic/escape.h:47
    #4 0x5562d06ca164 in cunescape ../src/basic/escape.h:50
    #5 0x5562d06ca75c in test_cunescape ../src/test/test-escape.c:100
    #6 0x5562d06cb954 in main ../src/test/test-escape.c:176
    #7 0x7f0cf0138152 in __libc_start_main (/lib64/libc.so.6+0x27152)

Direct leak of 10 byte(s) in 1 object(s) allocated from:
    #0 0x7f0cf22adaca in __interceptor_malloc /build/gcc/src/gcc/libsanitizer/asan/asan_malloc_linux.cc:144
    #1 0x7f0cf159a2ae in malloc_multiply ../src/basic/alloc-util.h:96
    #2 0x7f0cf159a2ae in cunescape_length_with_prefix ../src/basic/escape.c:303
    #3 0x5562d06ca164 in cunescape_length ../src/basic/escape.h:47
    #4 0x5562d06ca164 in cunescape ../src/basic/escape.h:50
    #5 0x5562d06ca70f in test_cunescape ../src/test/test-escape.c:97
    #6 0x5562d06cb954 in main ../src/test/test-escape.c:176
    #7 0x7f0cf0138152 in __libc_start_main (/lib64/libc.so.6+0x27152)

SUMMARY: AddressSanitizer: 73 byte(s) leaked in 4 allocation(s).

@yuwata
yuwata force-pushed the network-dhcp-accept-nul branch from 17732fc to 732e3a6 Compare January 27, 2020 10:58
@yuwata

yuwata commented Jan 27, 2020

Copy link
Copy Markdown
Member Author

@mrc0mmand Thanks. Fixed.

@ssahani

ssahani commented Jan 27, 2020

Copy link
Copy Markdown
Contributor

LGTM thanks

@poettering
poettering merged commit 4523f1d into systemd:master Jan 28, 2020
@yuwata
yuwata deleted the network-dhcp-accept-nul branch January 28, 2020 14:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Development

Successfully merging this pull request may close these issues.

systemd-networkd fails to decode DHCP SendOption with a null character (\00)

4 participants