Page MenuHomeFreeBSD
Files F144494924

D47689.diff
No OneTemporary
Actions

D47689.diff
View Options

diff --git a/include/limits.h b/include/limits.h
--- a/include/limits.h
+++ b/include/limits.h
@@ -137,6 +137,10 @@
#define MB_LEN_MAX 6 /* 31-bit UTF-8 */
+#if __POSIX_VISIBLE >= 202405
+#define GETENTROPY_MAX 256
+#endif
+
#include <sys/limits.h>
#if __POSIX_VISIBLE
diff --git a/lib/libc/gen/getentropy.3 b/lib/libc/gen/getentropy.3
--- a/lib/libc/gen/getentropy.3
+++ b/lib/libc/gen/getentropy.3
@@ -15,7 +15,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd November 20, 2024
+.Dd January 17, 2025
.Dt GETENTROPY 3
.Os
.Sh NAME
@@ -60,8 +60,8 @@
.Fa buf
parameter points to an
invalid address.
-.It Bq Er EIO
-Too many bytes requested, or some other fatal error occurred.
+.It Bq Er EINVAL
+Too many bytes requested.
.El
.Sh SEE ALSO
.Xr getrandom 2 ,
@@ -69,7 +69,7 @@
.Xr random 4
.Sh STANDARDS
.Fn getentropy
-nearly conforms to
+conforms to
.St -p1003.1-2024 .
.Sh HISTORY
The
@@ -80,9 +80,3 @@
.Fx
libc compatibility shim first appeared in
.Fx 12.0 .
-.Sh BUGS
-.In limits.h
-does not define
-.Dv GETENTROPY_MAX .
-Some error values do not match
-.St -p1003.1-2024 .
diff --git a/lib/libc/gen/getentropy.c b/lib/libc/gen/getentropy.c
--- a/lib/libc/gen/getentropy.c
+++ b/lib/libc/gen/getentropy.c
@@ -30,6 +30,7 @@
#include <sys/random.h>
#include <errno.h>
+#include <limits.h>
#include <signal.h>
#include <unistd.h>
#include <ssp/ssp.h>
@@ -47,8 +48,8 @@
{
ssize_t rd;
- if (buflen > 256) {
- errno = EIO;
+ if (buflen > GETENTROPY_MAX) {
+ errno = EINVAL;
return (-1);
}

File Metadata

Mime Type
text/plain
Expires
Mon, Feb 9, 8:27 PM (19 h, 5 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28602509
Default Alt Text
D47689.diff (1 KB)

Event Timeline