Skip to content

gh-127081: lock non-re-entrant *pwent calls #132748

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
kumaraditya303 merged 6 commits into from
May 22, 2025
Merged

gh-127081: lock non-re-entrant *pwent calls #132748

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
78c9cde
gh-127081: lock non-re-entrant *pwent calls
duaneg Apr 16, 2025
d30a139
Defer dec-refs on created entries until outside mutex to avoid possib…
duaneg Apr 20, 2025
6b78b29
Address reviewer feedback
duaneg Apr 26, 2025
33f7fea
Switch back to using functions available in the limited API.
duaneg Apr 26, 2025
7ca6858
Once the newly created pwent items are successfully added to the list…
duaneg May 21, 2025
68aa010
Remove no-longer needed include
duaneg May 22, 2025
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
Prev Previous commit
Next Next commit
Once the newly created pwent items are successfully added to the list… 
… they are

strongly referenced by that, so we can dec-ref them safely.
  • Loading branch information
@duaneg
duaneg committed May 21, 2025
commit 7ca685875c45c680c1bff3d07541ca0e12b4d508
16 changes: 5 additions & 11 deletions Modules/pwdmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,31 +308,25 @@ pwd_getpwall_impl(PyObject *module)
PyMutex_Lock(&getpwall_mutex);
#endif
int failure = 0;
PyObject *orphan = NULL;
PyObject *v = NULL;
setpwent();
while ((p = getpwent()) != NULL) {
/* NOTE: Ref counts are not decremented here, as we cannot allow
* re-entrancy while holding the mutex. */
PyObject *v = mkpwent(module, p);
v = mkpwent(module, p);
if (v == NULL || PyList_Append(d, v) != 0) {
orphan = v;
/* NOTE: cannot dec-ref here, while holding the mutex. */
failure = 1;
goto done;
}
Py_DECREF(v);
}

done:
endpwent();
#ifdef Py_GIL_DISABLED
PyMutex_Unlock(&getpwall_mutex);
#endif
/* Deferred decref on entries created above and added to the list. */
Py_ssize_t n = PyList_Size(d);
while (--n >= 0) {
Py_DECREF(PyList_GetItem(d, n));
}
if (failure) {
Py_XDECREF(orphan);
Py_XDECREF(v);
Py_CLEAR(d);
}
return d;
Expand Down
Loading