From nobody Thu Dec 01 14:26:09 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 4NNJKF4CsXz4jLh2; Thu, 1 Dec 2022 14:26:09 +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 4NNJKF3RH3z3vpL; Thu, 1 Dec 2022 14:26:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669904769; 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=m45T50HXpouNkR8Cxap7c2/EZIz2jp9BDv7MdYb7WLg=; b=xsIdRriKweIKG5sjVql9QueLqtDaf8fPd101PX2z4ZC25ZqEzX0aSUy8I5spDNtKtGfpbs FJ7CmXtr0NmpWvFnzPxaF3DQluu//15DX5z0JElMWY8VBaEuL3hFqd84EIWiD9QzYBF+MI v+0n9ZcJXwGjUxIyuuKDezBTqG004s3bbTo9u7T+B8XSHIG1BAy7G0+D/CL97aRUGxl6BT zOn1K102rExYdA+jBSp0l7cyH6Oe8XryWJU8JBAUzyK4bos0fujuS5nc+79GxvjuQr/wMZ D07dpzDLOZ1/Sw/ru+FwAwryFshe8JeBkZ3dmnD0M+gwCDldixs6LsWTpQSxig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669904769; 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=m45T50HXpouNkR8Cxap7c2/EZIz2jp9BDv7MdYb7WLg=; b=EEpKYlzgNU+iaYAUnlZgiO0yID0of9vDGHrrjGRnGPjoQZ6hRwF8RoTL/nrd/o2qT8Phld k3kGTdkJBr3aGCC5jfm0ja8sdcA/zPBrdw1H/rqkqg+czSUa6LGiNIEL8aDlOAh/9GZFoo pL2e0AVB/XFoxerjICE4Rp0YXsKq+VBBnVNSl9QEYlQ3n7nJs+Al+wmcIhZfUcqcODjKkD RgdP/0YpBczj9UG30XwcX/spvDxHbmTEuCMfK1NfScr4rr6Ja+QYw/bUW7+f622E9bCGiL C0s8X2xJJGpaIMfbejVE2Fh1o0b+RJUYvemjzfKHtvTHYeDTSbU4gbhT/ZoUMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669904769; a=rsa-sha256; cv=none; b=wmp3lkKAS4DNTw82Q6LLeJhyll2iYc6FV5bWA9I/23+TUmOLu8VW9T6+4A6QxaA6lR0I9M wmzGykAejz0BnxlEVPHawbt0VghYCuvJSGIUlTiV4nn8yISvr83/teNze90D52zpRgFtpP k2ho/7VWPTZVZDXVasHnpRQuxB6LAMHYgrPQvSY4iDmBtlhBwRtLqQAB4TFB7HjrYPz1UV 3sqrbI/oCtwvoqx9n85RMHtTOjM1H7s0/CiidGxynLkPoVYjKqu2CknFqke8XLO+Cd0Nvt ZzDjTps/k+8kFHUTR3lJeEcLLimGSXqet0LdV4XcXqun13DzHcPKfm49rzWwMA== 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 4NNJKF2Xd4zg8x; Thu, 1 Dec 2022 14:26:09 +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 2B1EQ9uu079714; Thu, 1 Dec 2022 14:26:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B1EQ9Tf079713; Thu, 1 Dec 2022 14:26:09 GMT (envelope-from git) Date: Thu, 1 Dec 2022 14:26:09 GMT Message-Id: <202212011426.2B1EQ9Tf079713@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: ca2e0c6b4afe - stable/12 - heimdal: Add missing kadm5 error checks 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/12 X-Git-Reftype: branch X-Git-Commit: ca2e0c6b4afe8b0a69e8e9e212ce447ba839f8ec Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=ca2e0c6b4afe8b0a69e8e9e212ce447ba839f8ec commit ca2e0c6b4afe8b0a69e8e9e212ce447ba839f8ec Author: Cy Schubert AuthorDate: 2022-11-26 17:06:09 +0000 Commit: Cy Schubert CommitDate: 2022-12-01 14:25:53 +0000 heimdal: Add missing kadm5 error checks Obtained from: Heimdal commit 4a0e01f9edabe36d0f2cab188078dd29fa5aaf02 (cherry picked from commit 879b0e9cd2ada8f815e208d31feb4b7c05ba7e4a) --- 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++){