From nobody Thu Dec 01 14:25:34 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 4NNJJb20Mlz4jLMj; Thu, 1 Dec 2022 14:25:35 +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 4NNJJZ72pZz3sdf; Thu, 1 Dec 2022 14:25:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669904735; 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=PxkluTorMU8AONfJe9f8mxnYVkzyD/8/b8DbgSMNQr8=; b=rgYgB0TEwzILheum6j4ZIK8dHiITVaPIjrNzrNjSgTdmeUZbdQn5cXjI+sqpDRrKIKEV6G SdttRmgMjRP553DCrzO6ag6Nthi7XD3idcsan6oHNE1b+1nz3RejQ7/kJNGlEIA3BtvWBU /iMqPP5D4p8V/bIYTP4TikCTu6iIHThTdTk52DrofG2iKycDq35XzeXHXjC4xvxFRwqcGI VeQ1aVhzubPtuJ8ww7E74wLdy/gMDAjR9FOO3GwyXpEksejVrUtIj0tRa1QeUv6JvLXYA4 kuP4SeMS5CSAXqdiQ9JkuW2tn6g5HIUGQUMrM37dC5z75Gv8PmWdP57AwF5TOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669904735; 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=PxkluTorMU8AONfJe9f8mxnYVkzyD/8/b8DbgSMNQr8=; b=OC875j4TbOyXyNSCia7a7vT/sKx7mgHVUo8k9IhRawYpUpsagt2GJDxih3YCyAonbPfEPE blUSY2fWM78cin9YrwX6MnGduhPEkPQA9dQeGfrsCqeuWwlQNo1WUdU6JahSbMMMF8ydtc KzmXAzi4yIn+bJyuYzPPX0xTho5H1sfbGE2Ul3F/O4Q4kXnOcuPPYLZwH/UL+Fm/1iMLuJ yCwE6Pg3qS7cP/nk4684sNbBjDvCcIslG/B7+NBpVeEBzN23siyU231OBZVy8IPyvzI99k YJr+mR/7CyH2pHCwpCK559JcSHnqdMCq3kJbF4MJrka8XpBiL9LoRW0GGv8oDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669904735; a=rsa-sha256; cv=none; b=PDG2Xpgwowh4IkVeiy/uj5prBi/oB1mAPo8vzhoyb4rp9aShv/6oBXnq1V/IktqQShYomF ssHx7X3Di+QzUIw7rMLjEYsS0O43e1pdjz7ldZ44uXWh6LcZgC91YbUA4vAODlniSCqtRb vgpfbICVWkWZSxm9a49hybEqV1Ps0+bPBI9y5azuAqHO/x5eRtoC6+/4wToaWU3+VWeFDq 9uIOW2Rim21y9NpY7W6/KKUT74L5eA/Aax7KnGmpqFunW79mxsaUrIuz+MSRpmamJSaeC/ p21lu1RDRl4FJuyKRG6qEWJXgi/ATJ5TK18K5bvpVVR/luy0wbCZtuDK3yV7Qw== 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 4NNJJZ67RlzfxX; Thu, 1 Dec 2022 14:25:34 +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 2B1EPYwi079280; Thu, 1 Dec 2022 14:25:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B1EPYHS079279; Thu, 1 Dec 2022 14:25:34 GMT (envelope-from git) Date: Thu, 1 Dec 2022 14:25:34 GMT Message-Id: <202212011425.2B1EPYHS079279@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: bc8c756a2f86 - stable/13 - heimdal: Check return code from _hdb_fetch_kvno() 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/13 X-Git-Reftype: branch X-Git-Commit: bc8c756a2f866841057848cf88daec64fdd5e508 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=bc8c756a2f866841057848cf88daec64fdd5e508 commit bc8c756a2f866841057848cf88daec64fdd5e508 Author: Cy Schubert AuthorDate: 2022-11-26 20:18:03 +0000 Commit: Cy Schubert CommitDate: 2022-12-01 14:25:11 +0000 heimdal: Check return code from _hdb_fetch_kvno() A malformed principal will cause kadmind to segfault. The PR addresses only when chpass is requested but delete is also affected. Fix both. PR: 268002 Reported by: Robert Morris (cherry picked from commit 671f55828d038e17fb29fd115b88e7cdf53500c3) --- crypto/heimdal/lib/kadm5/chpass_s.c | 2 +- crypto/heimdal/lib/kadm5/delete_s.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/crypto/heimdal/lib/kadm5/chpass_s.c b/crypto/heimdal/lib/kadm5/chpass_s.c index d5407d1549f4..624293e5c3a3 100644 --- a/crypto/heimdal/lib/kadm5/chpass_s.c +++ b/crypto/heimdal/lib/kadm5/chpass_s.c @@ -168,7 +168,7 @@ kadm5_s_chpass_principal_with_key(void *server_handle, return ret; ret = context->db->hdb_fetch_kvno(context->context, context->db, princ, 0, HDB_F_GET_ANY|HDB_F_ADMIN_DATA, &ent); - if(ret == HDB_ERR_NOENTRY) + if(ret) goto out; ret = _kadm5_set_keys2(context, &ent.entry, n_key_data, key_data); if(ret) diff --git a/crypto/heimdal/lib/kadm5/delete_s.c b/crypto/heimdal/lib/kadm5/delete_s.c index 7f8f537b06c0..fb5a52970ab9 100644 --- a/crypto/heimdal/lib/kadm5/delete_s.c +++ b/crypto/heimdal/lib/kadm5/delete_s.c @@ -50,7 +50,7 @@ kadm5_s_delete_principal(void *server_handle, krb5_principal princ) } ret = context->db->hdb_fetch_kvno(context->context, context->db, princ, HDB_F_DECRYPT|HDB_F_GET_ANY|HDB_F_ADMIN_DATA, 0, &ent); - if(ret == HDB_ERR_NOENTRY) + if (ret) goto out; if(ent.entry.flags.immutable) { ret = KADM5_PROTECT_PRINCIPAL;