summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2016-06-14 14:31:35 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2016-06-14 14:31:35 (GMT)
commitb98a36e8f3006512f0fa4d94309fb9918eb8abdd (patch)
tree70145e9fc9f6bb7e0698abf2798f23e71a000681
parentfd7f19ea67b0585929e723303c40de9153bba91d (diff)
downloadcpython-b98a36e8f3006512f0fa4d94309fb9918eb8abdd.zip
cpython-b98a36e8f3006512f0fa4d94309fb9918eb8abdd.tar.gz
cpython-b98a36e8f3006512f0fa4d94309fb9918eb8abdd.tar.bz2
Fix os.urandom() using getrandom() on Linux
Issue #27278: Fix os.urandom() implementation using getrandom() on Linux. Truncate size to INT_MAX and loop until we collected enough random bytes, instead of casting a directly Py_ssize_t to int.
-rw-r--r--Misc/NEWS4
-rw-r--r--Python/random.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index e132b96..7940cdc 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -13,6 +13,10 @@ Core and Builtins
Library
-------
+- Issue #27278: Fix os.urandom() implementation using getrandom() on Linux.
+ Truncate size to INT_MAX and loop until we collected enough random bytes,
+ instead of casting a directly Py_ssize_t to int.
+
- Issue #26386: Fixed ttk.TreeView selection operations with item id's
containing spaces.
diff --git a/Python/random.c b/Python/random.c
index 07dacfe..b961020 100644
--- a/Python/random.c
+++ b/Python/random.c
@@ -143,7 +143,7 @@ py_getrandom(void *buffer, Py_ssize_t size, int raise)
to 1024 bytes */
n = Py_MIN(size, 1024);
#else
- n = size;
+ n = Py_MIN(size, INT_MAX);
#endif
errno = 0;