gh-95380: Removing the 1024 bytes limit in the fcntl_ioctl_impl functions.#95526
gh-95380: Removing the 1024 bytes limit in the fcntl_ioctl_impl functions.#95526zenbooster wants to merge 11 commits into
Conversation
…ва разных варианта исправления.
…pl убрал buf[len] = '\0';
Пулл-реквест pythongh-95429 внёс по сути те же изменения, так что фокусируемся на отсутствующем там fcntl_ioctl_impl.
Консольная команда, использованная для обновления:
python Tools/clinic/clinic.py Modules/fcntlmodule.c
Если этого не сделать, автоматическая проверка пулл-реквеста увидит
рассинхронизацию, и у пул-реквеста в статусах будет крестик напротив
"Tests / Check if generated files are up to date".
python#95380 (comment) fcntl_ioctl_impl: add Py_DECREF.
Remove `fcntl_fcntl_impl` keeping `fcntl_ioctl_impl`
|
All commit authors signed the Contributor License Agreement. |
| if (mutate_arg && (len <= IOCTL_BUFSZ)) { | ||
| char *buf = PyBytes_AS_STRING(o); | ||
|
|
||
| memcpy(buf, str, len); |
There was a problem hiding this comment.
You can simply pass it to PyBytes_FromStringAndSize().
There was a problem hiding this comment.
On other hand, using NULL is necessary to prevent caching of newly created bytes object.
| } | ||
| PyBuffer_Release(&pstr); /* No further access to str below this point */ | ||
| if (ret < 0) { | ||
| Py_DECREF(o); |
There was a problem hiding this comment.
PyBuffer_Release() and Py_DECREF() can modify errno. You should save its value after ioctl() call and restore it just before PyErr_SetFromErrno().
|
The following commit authors need to sign the Contributor License Agreement: |
serhiy-storchaka
left a comment
There was a problem hiding this comment.
Since this PR was not active for a long time, I created an alternative PR #132907, which keeps using a 1024 bytes buffer for small arguments. This is safer in case of buffer overflow.
| if (mutate_arg && (len <= IOCTL_BUFSZ)) { | ||
| char *buf = PyBytes_AS_STRING(o); | ||
|
|
||
| memcpy(buf, str, len); |
There was a problem hiding this comment.
On other hand, using NULL is necessary to prevent caching of newly created bytes object.
Also decrefs added.