From nobody Sun Nov 27 02:44:02 2022 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 4NKXwy4ZMJz4hmQk; Sun, 27 Nov 2022 02:44:02 +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 4NKXwy442Bz3Qjm; Sun, 27 Nov 2022 02:44:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669517042; 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=fQ3wtUWID/EPsN5HiGjQg938ziqR6/mUXaAXzS1WHfY=; b=JGkA5lQ1XVTfrwaKoVyhW2DYISZCfmYEg1Ss918F26VDYfgkl0xVx2W7OA7QhhU9C2kWn1 dOFzQBWK0idgjbQCyMfboiKPlDP0X06bofsnstlDpP9EAaQ+r7l8llm7eYSY/bl7xYyeQ+ sMjUyWBh8ZEmEDxmzGc26XK+CGtyQ9guQCm/Kr0hzzop1ZOXUPnAcZptlPtD/EP34PcyMA Ip9pbSQkqii1N+VuGBdHqAgdaKPl1CCd8qV0r0uqL6tWt4picC93ikyX7qFhL+p527wuqG WFCBU4p8BVu4IFBlW3aHGBbZB2YCjyfcD6i+dczI8qAb1sE2BsEgtmqzJY5I/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669517042; 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=fQ3wtUWID/EPsN5HiGjQg938ziqR6/mUXaAXzS1WHfY=; b=asrLKHET7tfwdOPpjcNx38wPBlZKRqgLqBYQAKXaXHpIEi880F2Lh7iPxu79DGhuQrl9z1 ta+lP2sVqrxXphktHb6Vd5EG6Dm6UqL5TNMLauUKE8xirjvm/ZgcF3z4vtk4acvY+fp6Sm SBT5rFVCdDwq73DDBpBLHPDteUz8RuEtPCuwGrGxJf0ZvM0eWasO9+ojMGkyqaaival23P Ixb4FSH3z+iB4GyWhERwtSNFWPkmj+HcquklMW1Q1KvdH2gdF12aOmGXSLJ3I0Mkdi+0MX bFWbUCKORwmTR2gDLILhTJFFjgnGseqKmAY7Hn0HNVgNVqzHMis2VN3ZnEJeUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669517042; a=rsa-sha256; cv=none; b=CKI6vkb0ADdgL3YedIq5Ei5PMBO3PSTIw2Tu+zy4UlOiWm7gjjYSa7TFmr21A0h+oVnEmS IksdWzowuJsNMn/DhBgdyPjUwMBi/VxWn4jSQHInpgzPLMixYhCe216bFqYyR2aFolIePl KLExH/zCdRawFMz9YYCJVyraBHe9EqcmWUU30jQ7EN/bhaiC3/lmxr+p4n9CkvJV7Auf/P FYi748zA/lcd3WaYDHnWApzwMwin97xckAHsGohVYw5WRKZYwuPQb32X72EjOVGaLM5ZNe fzKz/h0AJba8b8TR8LXdTOdOJd8zwCbh3ee/gDA9w7wG7rP/aq51xsJjzumdeQ== 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 4NKXwy37tHzjCy; Sun, 27 Nov 2022 02:44:02 +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 2AR2i2b7088215; Sun, 27 Nov 2022 02:44:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AR2i2EN088214; Sun, 27 Nov 2022 02:44:02 GMT (envelope-from git) Date: Sun, 27 Nov 2022 02:44:02 GMT Message-Id: <202211270244.2AR2i2EN088214@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: e13150e28c93 - main - heimdal: Fix uninitialized pointer dereference 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: e13150e28c93d9e74f419dcd17d2e2bad41715ad Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=e13150e28c93d9e74f419dcd17d2e2bad41715ad commit e13150e28c93d9e74f419dcd17d2e2bad41715ad Author: Cy Schubert AuthorDate: 2022-11-25 23:29:14 +0000 Commit: Cy Schubert CommitDate: 2022-11-27 02:41:51 +0000 heimdal: Fix uninitialized pointer dereference krb5_ret_preincipal() returns a non-zero return code when a garbage principal is passed to it. Unfortunately ret_principal_ent() does not check the return code, with garbage pointing to what would have been the principal. This results in a segfault when free() is called. PR: 267944, 267972 Reported by: Robert Morris MFC after: 3 days --- crypto/heimdal/lib/kadm5/marshall.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/crypto/heimdal/lib/kadm5/marshall.c b/crypto/heimdal/lib/kadm5/marshall.c index fa7388b692fe..292cdf6107e8 100644 --- a/crypto/heimdal/lib/kadm5/marshall.c +++ b/crypto/heimdal/lib/kadm5/marshall.c @@ -187,9 +187,9 @@ ret_principal_ent(krb5_storage *sp, int i; int32_t tmp; - if (mask & KADM5_PRINCIPAL) - krb5_ret_principal(sp, &princ->principal); - + if (mask & KADM5_PRINCIPAL) + if (krb5_ret_principal(sp, &princ->principal)) + return EINVAL; if (mask & KADM5_PRINC_EXPIRE_TIME) { krb5_ret_int32(sp, &tmp); princ->princ_expire_time = tmp; @@ -208,9 +208,10 @@ ret_principal_ent(krb5_storage *sp, } if (mask & KADM5_MOD_NAME) { krb5_ret_int32(sp, &tmp); - if(tmp) - krb5_ret_principal(sp, &princ->mod_name); - else + if(tmp) { + if (krb5_ret_principal(sp, &princ->mod_name)) + return EINVAL; + } else princ->mod_name = NULL; } if (mask & KADM5_MOD_TIME) {