From nobody Thu Dec 01 14:26:05 2022 X-Original-To: dev-commits-src-branches@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 4NNJKB0sjbz4jLgq; Thu, 1 Dec 2022 14:26:06 +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 4NNJKB0N1gz3vkX; Thu, 1 Dec 2022 14:26:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669904766; 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=MbjEptQ74fTw0j5lD7qD637d468RsZ+kWR3sok/8bQ8=; b=QE1OD7YzGZZfZuOzkPJ9uQuVtCrZLvxZ+vpVM0OlWqzmeqbgnKjOK5rs3v5zaPh8epxht6 jN262xMDp6YaISks/KsBStLzYngePr+GGyjqp1TZVgQHJitQG89kn+UXeieYuW5do09bWG Jzy27t/RfUXvLE/tlVLraECOK6x9KbaARXVYpSnlkm7vJrKqlW0XYP95GPap9mu9zAxfRz 9vyT73WRxzrBc+Qi4nQHgffCwQzkNpE1RPZAspjcHQ29X3fCBAOwOpsJ9jNVQC7WnbZ3ww +I40T9fKt+pcxUxmBZeiNc8Fg47WV6QrrzQCgT5+rbHXt/ADoVj+mE2PdsIp5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669904766; 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=MbjEptQ74fTw0j5lD7qD637d468RsZ+kWR3sok/8bQ8=; b=nzh2EwBUsGQ8/s5gSuE202uXt4bKIkupBoD56vrQOq0HlmcJAssD0GHcdjPfe6Zh+3L9Z1 l3Xi5V7NR8/ScYZjCu/wyAQgxUrRAQZfZTkUpso0RkEOkjozQZEJU4W0pBMfI25OxJyNQ+ 3IdGutbCOuZM7oWrkVg1+qopqElJWjuRHOSYd4JuMIHyRnkT0MyyZtzpGTeqPN4X8MPuW3 hGh2pAOi1sIn0G6h74DfasaeugdOSONCwoqkbuXkQ+/rLbmqkOb2KrD7R9yU9Hr0ywtika 3tFSKoRCGg7Nm+iqMmMAGblsmpUselmnp2BlFe/E55RrDYz1DwGCnrkXmC4RNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669904766; a=rsa-sha256; cv=none; b=ldicvJnZun9PwMGYRqPRYIyRPtDhqi8vLbZ7qS9vX09Es8i4MRuD1mKE/V3NTPZjnF3rHh OgzEkQue+JyZSCcR7B22pAWa7Ym66sF0Wbmv4IC7Bf2Lnxqgf/i11c9L0HEubswIQTGr2o jd0W2RGOgF3i324vdbfxqIoZ13aOsKOeM0j8rjC+JHZVW4R2p62PvJp8c9Piur74Qf94ry yBZjv77ydrjqzgqNzlCwtVl9PBeBU5NI6NxFsYNj6uDjfEkI9pWDUKzRwC7bWThSO91GVj 8N4+zTzcDjYP+47h2HbGaolBhdf4cIgxXPLkBA1FYBmNeKFnR9+35MsJ5enl3Q== 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 4NNJK96bc0zgKF; Thu, 1 Dec 2022 14:26:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2B1EQ592079629; Thu, 1 Dec 2022 14:26:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B1EQ5ko079628; Thu, 1 Dec 2022 14:26:05 GMT (envelope-from git) Date: Thu, 1 Dec 2022 14:26:05 GMT Message-Id: <202212011426.2B1EQ5ko079628@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 7b07c9924f2d - stable/12 - heimdal: Handle other types of garbage data List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 7b07c9924f2de5a2d7b9951611770de45c6f8dab Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=7b07c9924f2de5a2d7b9951611770de45c6f8dab commit 7b07c9924f2de5a2d7b9951611770de45c6f8dab Author: Cy Schubert AuthorDate: 2022-11-24 15:07:43 +0000 Commit: Cy Schubert CommitDate: 2022-12-01 14:25:52 +0000 heimdal: Handle other types of garbage data In addition to garbage realm data, also handle garbage dbname, acl_file, stash_file, and invalid bitmask garbage data. PR: 267912 Reported by: Robert Morris (cherry picked from commit 91db848212e3b95cc689a1e8133a1d550b524919) --- crypto/heimdal/lib/kadm5/marshall.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/crypto/heimdal/lib/kadm5/marshall.c b/crypto/heimdal/lib/kadm5/marshall.c index 38b9855021b2..fa7388b692fe 100644 --- a/crypto/heimdal/lib/kadm5/marshall.c +++ b/crypto/heimdal/lib/kadm5/marshall.c @@ -333,12 +333,38 @@ _kadm5_unmarshal_params(krb5_context context, ret = krb5_ret_int32(sp, &mask); if (ret) goto out; + if (mask & KADM5_CONFIG_REALM & KADM5_CONFIG_DBNAME + & KADM5_CONFIG_ACL_FILE & KADM5_CONFIG_STASH_FILE) { + ret = EINVAL; + goto out; + } params->mask = mask; if (params->mask & KADM5_CONFIG_REALM) { ret = krb5_ret_string(sp, ¶ms->realm); if (params->realm == NULL) { ret = EINVAL; + goto out; + } + } + if (params->mask & KADM5_CONFIG_DBNAME) { + ret = krb5_ret_string(sp, ¶ms->dbname); + if (params->dbname == NULL) { + ret = EINVAL; + goto out; + } + } + if (params->mask & KADM5_CONFIG_ACL_FILE) { + ret = krb5_ret_string(sp, ¶ms->acl_file); + if (params->acl_file == NULL) { + ret = EINVAL; + goto out; + } + } + if (params->mask & KADM5_CONFIG_STASH_FILE) { + ret = krb5_ret_string(sp, ¶ms->stash_file); + if (params->stash_file == NULL) { + ret = EINVAL; } } out: