Skip to content

Fix 11396, doublefree on munmap in if-statement #4594

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.

Sign up for GitHub

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
orbitcowboy merged 1 commit into from
Nov 26, 2022
Merged

Fix 11396, doublefree on munmap in if-statement #4594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion lib/checkleakautovar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,9 +477,10 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,
// check for function call
const Token * const openingPar = isFunctionCall(innerTok);
if (openingPar) {
const Library::AllocFunc* allocFunc = mSettings->library.getDeallocFuncInfo(innerTok);
// innerTok is a function name
const VarInfo::AllocInfo allocation(0, VarInfo::NOALLOC);
functionCall(innerTok, openingPar, varInfo, allocation, nullptr);
functionCall(innerTok, openingPar, varInfo, allocation, allocFunc);
innerTok = openingPar->link();
}
}
Expand Down
30 changes: 30 additions & 0 deletions test/cfg/posix.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -892,6 +892,36 @@ void * identicalCondition_mmap(int fd, size_t size) // #9940
return buffer;
}

int munmap_no_double_free(int tofd, // #11396
int fromfd,
size_t len)
{
int rc;
void* fptr = mmap(NULL,len,PROT_READ|PROT_WRITE,MAP_SHARED,fromfd,(off_t)0);
if (fptr == MAP_FAILED) {
return -1;
}

void* tptr = mmap(NULL,len,PROT_READ|PROT_WRITE,MAP_SHARED,tofd,(off_t)0);
if (tptr == MAP_FAILED) {
// cppcheck-suppress memleak
return -1;
}

memcpy(tptr,fptr,len);

if ((rc = munmap(fptr,len)) != 0) {
// cppcheck-suppress memleak
return -1;
}

if ((rc = munmap(tptr,len)) != 0) {
return -1;
}

return rc;
}

void resourceLeak_fdopen(int fd)
{
// cppcheck-suppress unreadVariable
Expand Down