From nobody Thu Dec 01 14:26:12 2022 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 4NNJKK35ZQz4jLQX; Thu, 1 Dec 2022 14:26:13 +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 4NNJKJ6TKTz3wMD; Thu, 1 Dec 2022 14:26:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669904772; 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=hGQqSHH77UKcPmUzaSsJ2RdJbHVwZXpPyGsNbSlurGI=; b=EBq4ZRtudjw9WKVJFCzO/9StBQeZ8EObP1XuS2Y58VcP8nW/DZCpIbf/W1rwAJcUxhABFO zkfJIuGLnM6qAuevn8K2raKrP1jqGu+Z/LeU/8/gqZDQSDMY4EMGfL1SMmLMSpOlBIgLDV ug7gf79CK1ESyEhwmy/ORY+ZTkc4ExKXFzPcIJOpcUOCVwnm6ug2xN7Z1Cx/mhiSWz9Zoz +8A3FLPo8GkWAJBrgfHGXAAypmGdiG+yIu9s1HvJ4TlVP9R/kV2rVnVMILZscyP1Drvg7A LIYNZ6GJMbnqbwiJjuXACwGkB1zlF3Yz7QzDRpaZCcb0tlOoEgUgYKatH1mMOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669904772; 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=hGQqSHH77UKcPmUzaSsJ2RdJbHVwZXpPyGsNbSlurGI=; b=o08lZ/LnkjfgdW4ACENvPZdEETcYl/2a8zqSrytxnLwlGR/KWq4/tC3KbIYjRE1Fzlzin+ bA7HHk3UvD5qs5rfjqAm+wsyIjvwnEPpDcZQjepsT8xrsHAcp8U5aqakEjov3LDpvpRLEu 0PB4eEcxKFAmPImfbdy229lwubF8Jul5qQiMDZmYLoYfI2UGgt79JuFu5Lak+V7yDJTaUT b1U8IJqpaF7M5BirqhQ+mKVMGnA4z/JKRsP9xR0+uup+FmsI4uBYxIJ5lL/9uA+K6svsQY CuUZgLpav72ucWqdzctDmfqjfUO/l77mxvBiullQCPPUxGZxAvTYw8eb4WP8hw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669904772; a=rsa-sha256; cv=none; b=jkB82T1rmwPT5wYjZdnkcdDp/q2LI7CrrWm/5oIf3FRYyU9XKhsJ6RZ3lHDQg1z8GK+v7H MTZKgJiDkUIVyRP+bvLkj+DrP9ZPjjnMMsw83zWCGvc17SSRxxK1g0y3W8rXvX+glfqyDz vM+K6xmrTlk3g6i44alqOCwz9BLWKpNmA88Jw10PdOmZxmDi5FVixuO08plWNceyOcTmAT LwiPmxLUsCrQPOlhKyKMNhANw5TezXNDK1sVOPh9hJGU2+/FAi718v7y7eznW5s8KVe5YL +0rFd0icyM8t+tGgMzsAh6f1EYXtsFvHi/WBSa7wXeBQ9DbzjIQDDBQHmWm3Sw== 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 4NNJKJ5Jtczfv8; Thu, 1 Dec 2022 14:26:12 +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 2B1EQChp079786; Thu, 1 Dec 2022 14:26:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B1EQCHA079785; Thu, 1 Dec 2022 14:26:12 GMT (envelope-from git) Date: Thu, 1 Dec 2022 14:26:12 GMT Message-Id: <202212011426.2B1EQCHA079785@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: 2fd1b21c9c2b - stable/12 - heimdal: Check return code from _hdb_fetch_kvno() 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 2fd1b21c9c2b752f8aef771bfbc322a755dab040 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=2fd1b21c9c2b752f8aef771bfbc322a755dab040 commit 2fd1b21c9c2b752f8aef771bfbc322a755dab040 Author: Cy Schubert AuthorDate: 2022-11-26 20:18:03 +0000 Commit: Cy Schubert CommitDate: 2022-12-01 14:25:53 +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;