Modernizations and strictness improvements #464

cgzones · 2023-02-21T18:50:04Z

modernize the codebase by using modern C++ features
be more const-correct by using adjusting casts and enable -Wcast-qual
declare more read-only functions const
avoid value truncations in multiple places
avoid out-of-bounds memory access and integer overflows on malicious ELF data

Enable to parse the header file on its own, e.g. for language servers (clangd).

Make the behavior of functions more explicit.

Avoid creating a stringstream by using find().

Also declare the function static and warn if return value not used.

Prevent overflows in the addtion of q and size, and avoid truncations in callers by using size_t as type for size.

Enable common additional compiler warnings.

Abort on truncation of values being written to the ELF data, to prevent silent behavior mismatch.

Use auto to avoid implicit type conversion, hiding possible value truncation.

Reject ELF data that would lead to invalid memory access or integer overflows.

Mic92 · 2023-02-21T19:55:54Z

src/patchelf.cc

@@ -196,11 +196,11 @@ static FileContents readFile(const std::string & fileName,
    while ((portion = read(fd, contents->data() + bytesRead, size - bytesRead)) > 0)
        bytesRead += portion;

+    close(fd);


This could be even autoclosed later on.

Mic92 · 2023-02-21T20:00:21Z

Thank. Very appreciated. bors merge

Mic92 · 2023-02-21T20:00:45Z

bors merge

bors · 2023-02-21T20:05:26Z

Build succeeded:

cgzones added 17 commits February 21, 2023 19:40

Add required includes in header file

ce5907f

Enable to parse the header file on its own, e.g. for language servers (clangd).

Add misc functions annotations

fbb12a7

Make the behavior of functions more explicit.

Drop unnecessary friend declarations

09673eb

Use C++ casts instead of raw C ones in hdr()

404761c

Avoid unnecessary copies in splitColonDelimitedString()

a393454

Avoid creating a stringstream by using find().

Close file before potentially throwing

c00676a

Drop unnecessary casts in getElfType()

98d1813

Also declare the function static and warn if return value not used.

Avoid potential overflows in checkPointer()

e883229

Prevent overflows in the addtion of q and size, and avoid truncations in callers by using size_t as type for size.

Use C++11 [[noreturn]]

b2897ab

Drop superfluous semicolons

1c2d1ff

Declare file local functions static

889350d

Avoid dropping const qualifier

b5b59ca

Enable Wextra

959cd16

Enable common additional compiler warnings.

Avoid implicit value truncations in wri()

28e95b3

Abort on truncation of values being written to the ELF data, to prevent silent behavior mismatch.

Avoid implicit conversion

00d1e82

Use auto to avoid implicit type conversion, hiding possible value truncation.

Declare more read-only functions const

81c64dd

Avoid memory corruption on invalid ELF input

ff7a5be

Reject ELF data that would lead to invalid memory access or integer overflows.

Mic92 marked this pull request as ready for review February 21, 2023 19:52

Mic92 reviewed Feb 21, 2023

View reviewed changes

bors bot merged commit e37f892 into NixOS:master Feb 21, 2023

cgzones deleted the work branch February 22, 2023 16:24

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Modernizations and strictness improvements #464

Modernizations and strictness improvements #464

cgzones commented Feb 21, 2023

Mic92 Feb 21, 2023

Mic92 commented Feb 21, 2023

Mic92 commented Feb 21, 2023

bors bot commented Feb 21, 2023

Modernizations and strictness improvements #464

Modernizations and strictness improvements #464

Conversation

cgzones commented Feb 21, 2023

Mic92 Feb 21, 2023

Choose a reason for hiding this comment

Mic92 commented Feb 21, 2023

Mic92 commented Feb 21, 2023

bors bot commented Feb 21, 2023