aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Johnston <markj@FreeBSD.org>2024-02-04 02:22:09 +0000
committerMark Johnston <markj@FreeBSD.org>2024-02-04 22:52:30 +0000
commitdfabf3efaa795e657f3858b7e2d0b11f8a51ecb5 (patch)
treeebc173bd96be0d526cfdf1c9aef1585eb0ca921a
parent064fa628ce375028f2510182f4edbafa7f469ecb (diff)
downloadsrc-dfabf3efaa795e657f3858b7e2d0b11f8a51ecb5.tar.gz
src-dfabf3efaa795e657f3858b7e2d0b11f8a51ecb5.zip
libjail: Guard against programmer error in jailparam_export()
If the caller didn't use jailparam_import() to fetch the parameter value, an attempt to export it will trigger a segfault. Make it a bit easier to figure out what's happening in this situation. PR: 276809 Reviewed by: jamie MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43732
-rw-r--r--lib/libjail/jail.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/libjail/jail.c b/lib/libjail/jail.c
index 864c6981db2b..8e5b420d677b 100644
--- a/lib/libjail/jail.c
+++ b/lib/libjail/jail.c
@@ -737,6 +737,12 @@ jailparam_export(struct jailparam *jp)
int i, nval, ival;
char valbuf[INET6_ADDRSTRLEN];
+ if (jp->jp_value == NULL) {
+ snprintf(jail_errmsg, JAIL_ERRMSGLEN,
+ "parameter %s was not imported", jp->jp_name);
+ errno = EINVAL;
+ return (NULL);
+ }
if ((jp->jp_ctltype & CTLTYPE) == CTLTYPE_STRING) {
value = strdup(jp->jp_value);
if (value == NULL)