Skip to content

Updates posix_memalign to consider malloc may fail #5512

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 8, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions regression/cbmc-library/posix_memalign-01/test.desc
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
CORE
main.c
--pointer-check --bounds-check
--pointer-check --bounds-check --malloc-may-fail --malloc-fail-null

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't completely understand the changes for this test. You are changing the flags but not the expected output?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added the flags, so now the test considers malloc can fail. However, this doesn't change the expected output of this test, since it's resilient to a failed malloc. @hannes-steffenhagen-diffblue

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@feliperodri I'd recommend to reverse the changes here. Tests should be self contained and not contain flags that aren’t relevant for the test. This test is unrelated to --malloc-may-fail and hence shouldn’t use the flag.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@hannes-steffenhagen-diffblue I'll send a new PR that update these flags. I'll keep the failed regression test with the malloc flags and I'll remove them from the this test case.

VERIFICATION SUCCESSFUL
^EXIT=0$
^SIGNAL=0$
--
^\*\*\*\* WARNING: no body for function posix_memalign
^warning: ignoring
13 changes: 13 additions & 0 deletions regression/cbmc-library/posix_memalign-02/main.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#include <stdlib.h>
#include <string.h>

int main()
{
size_t size = 4;
size_t page_size = 4096;
void *src = "testing";
void *dest;
posix_memalign(&dest, page_size, size);
memcpy(dest, src, size);
return 0;
}
11 changes: 11 additions & 0 deletions regression/cbmc-library/posix_memalign-02/test.desc
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
CORE
main.c
--pointer-check --bounds-check --malloc-may-fail --malloc-fail-null
^EXIT=10$
^SIGNAL=0$
^VERIFICATION FAILED$
\[main.precondition_instance.1\] .* memcpy src/dst overlap: FAILURE
\[main.precondition_instance.3\] .* memcpy destination region writeable: FAILURE
\*\* 2 of 14 failed
--
^warning: ignoring
21 changes: 7 additions & 14 deletions src/ansi-c/library/stdlib.c
Original file line number Diff line number Diff line change
Expand Up @@ -525,20 +525,13 @@ __CPROVER_HIDE:;
// As _mid_memalign simplifies for alignment <= MALLOC_ALIGNMENT
// to a malloc call, it should be sound, if we do it too.

// The original posix_memalign check on the pointer is:

// void *tmp = malloc(size);
// if(tmp != NULL){
// *ptr = tmp;
// return 0;
// }
// return ENOMEM;

// As _CPROVER_allocate used in malloc never returns null,
// this check is not applicable and can be simplified:

*ptr = malloc(size);
return 0;
void *tmp = malloc(size);
if(tmp != (void *)0)
{
*ptr = tmp;
return 0;
}
return ENOMEM;
}

/* FUNCTION: random */
Expand Down