From nobody Wed Feb 8 23:09:31 2023 X-Original-To: dev-commits-src-main@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 4PBwgJ1fG3z3n5ZQ; Wed, 8 Feb 2023 23:09:32 +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 4PBwgJ0y5mz43D2; Wed, 8 Feb 2023 23:09:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675897772; 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=8rvGbTKPI1bmDTTcGqpTyqOkLqo+Xkaw2Qf9e07/Tqg=; b=JGStVcqS4edzpxfeVlYJnV+1CuXU4RYxMotDUZg6S5syvvdjwNnkNDjMHeYqTHR82aYLTO FGgRhrS23i7IOPyOAweqoekHil6k0lY4eSNDzB6MJLU12E2AaSOBuBLqkjut8j3pnUhbPS 8bKZ3hmA9gOFGoKtgvwsXJ7PWK0H5qh3DsUGhv9mLCzcbKRTEh/ofQZNE35rzwt8c7FKdX gtqvu0AG6dcwYdaY55FOrPQgJ2rePafS0MJ9tzTZfLuyqs/6BoAmVDTlfvaACN7A+/j/3G M2zIwMHE1yttytcyFcgbL/F426aMAWKwGGOYM+C3RgBvH9R+jkCNVfUUUzP5Nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675897772; 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=8rvGbTKPI1bmDTTcGqpTyqOkLqo+Xkaw2Qf9e07/Tqg=; b=LmPwdknkUgJNQrXkDuViBaKqPi7jAz0wj821Ebuz35YCLvPCtitCYNDTagvr9FhvU0nQYT cTeb9Irprs2vn74xNclEXRvmhe8nkDUjCK5GLZHwvHYV1DItWwnNuj+bfPD2TYUPFyeLjc r8/J8J7eZNbrxsxIcdq5yILg20q5O3vsDDGv+eUkRvWHmdPckRyf1Bg3n4GqOTYparlnBd E2PrZ54i/p1RTsupTD9gExoZen60fmN16OZx2fZIXi1wdjgO9vh5fmwkKnNNvIKwo9LJcU Te6R+MR4orRG0s2FO1UmwrDk28KHanL3/i50H9NhIaDKVvS1GJ9Zp7CCkkpZVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675897772; a=rsa-sha256; cv=none; b=Yd8//43Ph7VuYch/oXn7mhaaYM7jeU5cOkyqw8r/muXoebtI4GIX7Nwxj8Mqe/sgeRzF76 wgVFJ3tUgFtPgiLHsIYg/WwifDGAWGZB+Df0Kng/D3F3GRxh9QGgP+s1TwdaqzD9Ge7dlg /UIGtwruuaKSFqgUIIRIB+Fwe6dra558bito4E5XTlXQeb+ODelDBRJBJU5rV+tdVAoyZT kmVpWzgRO9C1o2cTyX9mxu9K4Z46KHwMlwtBJa+bUrE3PvU+t6J5SRmiciuYQANRRYoa7Z 5Og33Xs3zCJVIVtlLCgqqmYaIkWzX3nVB33Kp0WeYhoQXhASI0IAil+XQFjavg== 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 4PBwgH6tQgzFdj; Wed, 8 Feb 2023 23:09:31 +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 318N9VtJ039394; Wed, 8 Feb 2023 23:09:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 318N9Vv1039393; Wed, 8 Feb 2023 23:09:31 GMT (envelope-from git) Date: Wed, 8 Feb 2023 23:09:31 GMT Message-Id: <202302082309.318N9Vv1039393@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 6a70e0b4cdc6 - main - heimdal: Resolve hdb_free_entry() SIGSEGV/SIGILL List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 6a70e0b4cdc606931555cdc59dc6c8d4a3ab4e3e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=6a70e0b4cdc606931555cdc59dc6c8d4a3ab4e3e commit 6a70e0b4cdc606931555cdc59dc6c8d4a3ab4e3e Author: Cy Schubert AuthorDate: 2023-02-07 15:46:59 +0000 Commit: Cy Schubert CommitDate: 2023-02-08 23:08:54 +0000 heimdal: Resolve hdb_free_entry() SIGSEGV/SIGILL When the client sends kadmind a create principal (kadm_create) request kadm_s_create_principal() returns an error before zeroing out ent (an hdb entry structure wrapper -- hdb_entry_ex), resulting in a NULL reference. Fix obtained from upstream commit 35ea4955a. PR: 268059 Reported by: Robert Morris Obtained from: Heimdal commit 35ea4955a MFC after: 3 days --- crypto/heimdal/lib/kadm5/create_s.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto/heimdal/lib/kadm5/create_s.c b/crypto/heimdal/lib/kadm5/create_s.c index 04312c024ed3..1033ca103239 100644 --- a/crypto/heimdal/lib/kadm5/create_s.c +++ b/crypto/heimdal/lib/kadm5/create_s.c @@ -65,6 +65,7 @@ create_principal(kadm5_server_context *context, kadm5_principal_ent_rec defrec, *defent; uint32_t def_mask; + memset(ent, 0, sizeof(*ent)); if((mask & required_mask) != required_mask) return KADM5_BAD_MASK; if((mask & forbidden_mask)) @@ -72,7 +73,6 @@ create_principal(kadm5_server_context *context, if((mask & KADM5_POLICY) && strcmp(princ->policy, "default")) /* XXX no real policies for now */ return KADM5_UNK_POLICY; - memset(ent, 0, sizeof(*ent)); ret = krb5_copy_principal(context->context, princ->principal, &ent->entry.principal); if(ret)