From nobody Sun Feb 11 15:15:37 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TXrkf2dJdz59tRd; Sun, 11 Feb 2024 15:15:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TXrkd6h9zz4b74; Sun, 11 Feb 2024 15:15:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707664537; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Cnkm2dSDzYDOeJoEdgNB/K715tTu9uuLDXFH5DJmZnw=; b=GamwGH0njPqSDB7Mkf5r7SZxxIJEOF8C7SiQFJJY91Npvh5gcfolsFnUIMWiqDjjKwTljA yUnSOauAgpUxggt1bAGCSnYqTcttaKWt7yd45YvlBJQyhvCmqr6F/58E9Cjs9CNhSlV9/b PchVJAoucsruMPTnFFIgasrwmUeCVtn/zdso+kraXG5/ALG/Gt04rQsI7tEfRjmwpipEaf okGOV+0kNpFqRpCOH1ZNDW27yNCJ++g+Jy27Q/q2myTRWIuKpeb39cugCdhE1jmMla0bEZ LkeCr4snMquGVWgXXY974+WbzcB9kS2dWtebF/7/5EbX9ng4L8iX36i6hKI1ow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707664537; a=rsa-sha256; cv=none; b=TjCyKsAT3S/46NkCWqNzIwj08zyzAXyfH92NPNzF8+7yJBTK7xT15lr36gVCNSYCGxPJhy 5JtzldFN5hY0G2fatn2mt2uhYfEH3NeMruI+9zccAxtFTvU1Gx4jR//qFjiN22fLMbufkd uX8QPKQXbky6y4sPG2xCGSbz93dS2Di24kFbQdazugxt7fMb1gTfmbIlfZvTypyc0B2hKO GqlxmrjHLMlirtrz2Eb2gSrvHBeTupA2GX/SKjj4JPJLQKFuOXvKDzG0WFfcvRqDK3NAyl rXwj0PbVWCMWA/y/UJLyxkY//wb4kAZpuLBzTUnJlUnbEvBEZSb58EzLttz/+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707664537; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Cnkm2dSDzYDOeJoEdgNB/K715tTu9uuLDXFH5DJmZnw=; b=BOy2CxevvAjCb8c33qA8j1d6GmTG57juUWAqP+mGyFwR8mDIF3Jx8k4suLNMxlHXjA4upX 0Ol5xeI1ZrMwnpSBDCqd8ZEQOjBRnN2FsQOpMeLmmzcc/yi1oHaH7z0fD5u0EEzh4HZRWc ciB16Lw2Gwes0U8TlRsPO6cOwW6khc8eqdk4QHARwSXnh4zrz7qwRnN7fY3j8QHOCItBvf J6GLzFVYQ4loU20GtUHeHSq0mTTiUFh0fH4TvSTp/9iwrt7BrBIhwyTcVjdqtrcZOIy7lD /Qk3kM+ro+tiaKcH/ZYINOiz9N90ZN/nUh9fLccv+yhYQVnptkEaGKv9Prxo+g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TXrkd5mlwz14JM; Sun, 11 Feb 2024 15:15:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41BFFbDS041198; Sun, 11 Feb 2024 15:15:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41BFFbS7041195; Sun, 11 Feb 2024 15:15:37 GMT (envelope-from git) Date: Sun, 11 Feb 2024 15:15:37 GMT Message-Id: <202402111515.41BFFbS7041195@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 5e21d7cd3119 - stable/14 - libjail: Guard against programmer error in jailparam_export() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5e21d7cd31194faf8c2bdda2bc60adf34eaa405a Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5e21d7cd31194faf8c2bdda2bc60adf34eaa405a commit 5e21d7cd31194faf8c2bdda2bc60adf34eaa405a Author: Mark Johnston AuthorDate: 2024-02-04 02:22:09 +0000 Commit: Mark Johnston CommitDate: 2024-02-11 15:14:59 +0000 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 (cherry picked from commit dfabf3efaa795e657f3858b7e2d0b11f8a51ecb5) --- lib/libjail/jail.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/libjail/jail.c b/lib/libjail/jail.c index 04fd6d3c4250..2af210ebb198 100644 --- a/lib/libjail/jail.c +++ b/lib/libjail/jail.c @@ -738,6 +738,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)