Skip to content

[2.7] bpo-35368: Make PyMem_Malloc() thread-safe in debug mode #10828

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
vstinner merged 1 commit into from
Dec 3, 2018
Merged

[2.7] bpo-35368: Make PyMem_Malloc() thread-safe in debug mode #10828

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
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Core and Builtins/2018-11-30-17-50-28.bpo-35368.DNaDao.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
:c:func:`PyMem_Malloc` is now also thread-safe in debug mode.
59 changes: 53 additions & 6 deletions Objects/obmalloc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1413,6 +1413,38 @@ pool_is_in_list(const poolp target, poolp list)

#endif /* Py_DEBUG */

static void *
_PyMem_Malloc(size_t nbytes)
{
if (nbytes > (size_t)PY_SSIZE_T_MAX) {
return NULL;
}
if (nbytes == 0) {
nbytes = 1;
}
return malloc(nbytes);
}

static void *
_PyMem_Realloc(void *p, size_t nbytes)
{
if (nbytes > (size_t)PY_SSIZE_T_MAX) {
return NULL;
}
if (nbytes == 0) {
nbytes = 1;
}
return realloc(p, nbytes);
}


static void
_PyMem_Free(void *p)
{
free(p);
}


/* Let S = sizeof(size_t). The debug malloc asks for 4*S extra bytes and
fills them with useful stuff, here calling the underlying malloc's result p:

Expand Down Expand Up @@ -1479,7 +1511,7 @@ _PyObject_DebugCheckAddress(const void *p)

/* generic debug memory api, with an "id" to identify the API in use */
void *
_PyObject_DebugMallocApi(char id, size_t nbytes)
_PyObject_DebugMallocApi(char api, size_t nbytes)
{
uchar *p; /* base address of malloc'ed block */
uchar *tail; /* p + 2*SST + nbytes == pointer to tail pad bytes */
Expand All @@ -1491,13 +1523,18 @@ _PyObject_DebugMallocApi(char id, size_t nbytes)
/* overflow: can't represent total as a size_t */
return NULL;

p = (uchar *)PyObject_Malloc(total);
if (api == _PYMALLOC_OBJ_ID) {
p = (uchar *)PyObject_Malloc(total);
}
else {
p = (uchar *)_PyMem_Malloc(total);
}
if (p == NULL)
return NULL;

/* at p, write size (SST bytes), id (1 byte), pad (SST-1 bytes) */
/* at p, write size (SST bytes), api (1 byte), pad (SST-1 bytes) */
write_size_t(p, nbytes);
p[SST] = (uchar)id;
p[SST] = (uchar)api;
memset(p + SST + 1 , FORBIDDENBYTE, SST-1);

if (nbytes > 0)
Expand Down Expand Up @@ -1529,7 +1566,12 @@ _PyObject_DebugFreeApi(char api, void *p)
nbytes += 4*SST;
if (nbytes > 0)
memset(q, DEADBYTE, nbytes);
PyObject_Free(q);
if (api == _PYMALLOC_OBJ_ID) {
PyObject_Free(q);
}
else {
_PyMem_Free(q);
}
}

void *
Expand Down Expand Up @@ -1561,7 +1603,12 @@ _PyObject_DebugReallocApi(char api, void *p, size_t nbytes)
* case we didn't get the chance to mark the old memory with DEADBYTE,
* but we live with that.
*/
q = (uchar *)PyObject_Realloc(q - 2*SST, total);
if (api == _PYMALLOC_OBJ_ID) {
q = (uchar *)PyObject_Realloc(q - 2*SST, total);
}
else {
q = (uchar *)_PyMem_Realloc(q - 2*SST, total);
}
if (q == NULL) {
if (nbytes <= original_nbytes) {
/* bpo-31626: the memset() above expects that realloc never fails
Expand Down