git: 75befde07bdf - stable/11 - jail: Don't allow substitution of valueless jail parameters. PR: 256544 Reported by: cryptogranny at gmail.com

Jamie Gritton jamie at FreeBSD.org
Thu Jun 24 17:54:18 UTC 2021


The branch stable/11 has been updated by jamie:

URL: https://cgit.FreeBSD.org/src/commit/?id=75befde07bdf1e3059c8c5e8928a695e5e59d698

commit 75befde07bdf1e3059c8c5e8928a695e5e59d698
Author:     Jamie Gritton <jamie at FreeBSD.org>
AuthorDate: 2021-06-18 16:44:37 +0000
Commit:     Jamie Gritton <jamie at FreeBSD.org>
CommitDate: 2021-06-24 17:54:00 +0000

    jail: Don't allow substitution of valueless jail parameters.
    PR:             256544
    Reported by:    cryptogranny at gmail.com
    
    (cherry picked from commit 5bf6dca2c6dbf63d382e97905e205ded3e8525d2)
---
 usr.sbin/jail/config.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr.sbin/jail/config.c b/usr.sbin/jail/config.c
index cb353ed4563e..554779e84720 100644
--- a/usr.sbin/jail/config.c
+++ b/usr.sbin/jail/config.c
@@ -196,7 +196,7 @@ load_config(void)
 				TAILQ_FOREACH(vp, &j->params, tq)
 					if (!strcmp(vp->name, v->name))
 						break;
-				if (!vp) {
+				if (!vp || TAILQ_EMPTY(&vp->val)) {
 					jail_warnx(j,
 					    "%s: variable \"%s\" not found",
 					    p->name, v->name);


More information about the dev-commits-src-all mailing list