From nobody Sun Nov 27 02:44:04 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 4NKXx11NtFz4hmR2; Sun, 27 Nov 2022 02:44:05 +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 4NKXx05tdFz3Qj3; Sun, 27 Nov 2022 02:44:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669517044; 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=W0M2pFVdYQzDLo0CtxZPftnprZPsrFlpCnYIqgEYsks=; b=mQm2XSGP0I0UO3jmfv3C03Kr5W/3Ysz8zjuHuJLudYBZn5A+T3kl+EmtVorwhwguyw2jLz Bi3IIAPffuMyNAO5hnDGCcckJaEBRslON/PAl5z55MFJRe0KiQISGb/eecSPLcgfEBPOUn 4BXLiQZRjzel/OBozVM0GnPAxTSrjfEpBm8zgb7I36IYxLJOnafMTP0ZP2UY0RgyRX0m2E 0QBddPCsUrjLquz0ZYuZmBDK2zrOoCecG1IqiMFd0ZqbkzkGzFuiVyQffO/FXydgGouYn+ +yrUoSMxnLiakDL7etq2MFzj1Iw4GXPHQipHXAxGhwbgfJDKVOvu4rK0Y1kJ5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669517044; 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=W0M2pFVdYQzDLo0CtxZPftnprZPsrFlpCnYIqgEYsks=; b=i4i73pao83uSUTpzb0XiTaPLMGeCTBqmvNj2xyxfOUSHxdJRb+KRzHV3pnK4EzIW2m3u9h vCDvyimjrf7kBph37wFJseVUvIky9bRqkRTmnxLS5VvWv4aWqlczoi6QEx3qwQUUiG/jvP gWoG+HPWKDoFlVlApM2M4WUSZvRczDf7JETIFgtsuQZIQvfJ8uciOPV/SLL0bQa6H3ul/n HoNU25k46TZe9AZ6YJ8PdFUFH5Bq/W8LJVTCUrB7pmDvfsMHophfyQtKiulH8ZivkLdU1K kFzO4w/Z/LUNUzMp/38Ws1d7YrqHLHzbplnJCGLKfR9bjHYaqTx+ByHeUDvGSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669517044; a=rsa-sha256; cv=none; b=XYDnLyXLlG17duXS+/+gLQ4IOiNsQX9K7zbAjSjsjN/+kyNgZy3uEsgaSik4B2sGotagIA g5OWh1GzVdK1rHYyU+a1MSLa9m7AGfzrksEHYUCm5dBgDI3jgXvHBPWPv9cm9MmVjwGyPP 84L8hWRPMkAuuNDgeoquVpVjpu3p6MVNhu560R7ZnHiAK7j6i6uFRsmmz7TqLx8+UXNbyD PdydWsz9gerPt1bOMB81dM7Kg7FeBa2rogicX3dpgTMW/r4yX23GAWzC7/7Sshuq88dCRv Q5XATMP6GkbyVwg0ApHWyO1xrrnhiCTs0yhEB6za7mEpgehoXtpM2+fy93YR6w== 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 4NKXx0508TzjNm; Sun, 27 Nov 2022 02:44:04 +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 2AR2i4kD088269; Sun, 27 Nov 2022 02:44:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AR2i4wa088268; Sun, 27 Nov 2022 02:44:04 GMT (envelope-from git) Date: Sun, 27 Nov 2022 02:44:04 GMT Message-Id: <202211270244.2AR2i4wa088268@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: 879b0e9cd2ad - main - heimdal: Add missing kadm5 error checks 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/main X-Git-Reftype: branch X-Git-Commit: 879b0e9cd2ada8f815e208d31feb4b7c05ba7e4a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=879b0e9cd2ada8f815e208d31feb4b7c05ba7e4a commit 879b0e9cd2ada8f815e208d31feb4b7c05ba7e4a Author: Cy Schubert AuthorDate: 2022-11-26 17:06:09 +0000 Commit: Cy Schubert CommitDate: 2022-11-27 02:41:52 +0000 heimdal: Add missing kadm5 error checks Obtained from: Heimdal commit 4a0e01f9edabe36d0f2cab188078dd29fa5aaf02 MFC after: 3 days --- crypto/heimdal/lib/kadm5/get_princs_s.c | 3 ++- crypto/heimdal/lib/kadm5/get_s.c | 2 ++ crypto/heimdal/lib/kadm5/rename_s.c | 4 +++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/crypto/heimdal/lib/kadm5/get_princs_s.c b/crypto/heimdal/lib/kadm5/get_princs_s.c index 55c8f2e98b60..3ccd18f87a14 100644 --- a/crypto/heimdal/lib/kadm5/get_princs_s.c +++ b/crypto/heimdal/lib/kadm5/get_princs_s.c @@ -93,7 +93,8 @@ kadm5_s_get_principals(void *server_handle, d.exp = expression; { krb5_realm r; - krb5_get_default_realm(context->context, &r); + if ((ret = krb5_get_default_realm(context->context, &r))) + return (ret); asprintf(&d.exp2, "%s@%s", expression, r); free(r); } diff --git a/crypto/heimdal/lib/kadm5/get_s.c b/crypto/heimdal/lib/kadm5/get_s.c index 6c456e118316..6c966a9281e1 100644 --- a/crypto/heimdal/lib/kadm5/get_s.c +++ b/crypto/heimdal/lib/kadm5/get_s.c @@ -231,6 +231,8 @@ kadm5_s_get_principal(void *server_handle, unsigned char buf[4]; _krb5_put_int(buf, last_pw_expire, sizeof(buf)); ret = add_tl_data(out, KRB5_TL_LAST_PWD_CHANGE, buf, sizeof(buf)); + if (ret) + goto out; } if(ret){ kadm5_free_principal_ent(context, out); diff --git a/crypto/heimdal/lib/kadm5/rename_s.c b/crypto/heimdal/lib/kadm5/rename_s.c index 08351290c9a6..1b3cc5a11f3b 100644 --- a/crypto/heimdal/lib/kadm5/rename_s.c +++ b/crypto/heimdal/lib/kadm5/rename_s.c @@ -66,7 +66,9 @@ kadm5_s_rename_principal(void *server_handle, Salt salt; krb5_salt salt2; memset(&salt, 0, sizeof(salt)); - krb5_get_pw_salt(context->context, source, &salt2); + ret = krb5_get_pw_salt(context->context, source, &salt2); + if (ret) + goto out; salt.type = hdb_pw_salt; salt.salt = salt2.saltvalue; for(i = 0; i < ent.entry.keys.len; i++){