From nobody Mon Dec 5 21:50:34 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 4NQy0C3FcDz4jdtn; Mon, 5 Dec 2022 21:50:35 +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 4NQy0C0YyRz3sm3; Mon, 5 Dec 2022 21:50:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670277035; 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=9RWBMhAYrLGxkuWGRBUu8itG4f/kbjsk1DVa/THKr7A=; b=JX5ZRCuyAfmtNSv254XZfVyTE4Uh2AMGqdkOl57iMz6GdXnDU0Vxc7tj6AaABGHUDS96cC bnxv9ODHmieMvnYS7XFbXWSSQJ4MlIMsKRmrhnpmQf44c+3q+2NuZf/mzJpSMliYOY9tLh dcN1vtGVTDtyFdpFUiU4iXZK5M1Q8vyU8zCYCarZIOw0+hpbW8TA4T7VSVBLk1at+pOB54 GgSIeH5LkIIqQ6geMwIWuohjPFpK7vk1VwPmrlS6tD0ir3Htc1j1P238K2k3uhaHVNpQ8s SHULLuLioQeW/SRha68gDgf+hkeIRPIWKCBuFm1w7h5mOxkyC5sOWCOO8tHd7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670277035; 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=9RWBMhAYrLGxkuWGRBUu8itG4f/kbjsk1DVa/THKr7A=; b=qVGU+k2kP5cWxd8zBZb5NrBUrlvMRFNb9ETEr5UAqqmC0mjhjlkFZaurSl28Gz0Jp++Lqx t98Mq3jaj5Xv08QOMc4pZMBMldHg3Aj3ulf0D2m5zwg2kpZS5d81SKmHOGRsFME2YbtrcO Bmyjd9yKxDaJpnx0CUxNx3agqTZJx5V0p9yfLWEEQmAEuFoDVgEEICueUOrsodCiKdVBJT 1xffLqoPhsJRJCaHzBZZBWhUGJlbPCrDL7JtQOLXShWs27ec8rpMJhFNlSJIl0/cr7qUdm 127vuZnVB48QyaQ2t+92H6hGPzraduY8jzRCQgEE7ZvNfR/btCzjVRF3GNghDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670277035; a=rsa-sha256; cv=none; b=Lso4sBcJReywqAN2FFW/65iGJuh4kZYMewbBxYMhdTGBDg6Lhks2JLyXSla2mgB9eKYHVS Wulgwc2JhZKD1QLsWLPrTI8CmNIaoHFX7jRyshwXfbQVOGmIm7WEKJRoFEt30ihlUSLXfb rdsD2ydgOQSiFu64jfDsiRx1NcasQFm20/F3RC2Ebcu9mlCMhRLwSP1d/8r27+yQDw6MZL xlRLQJfCN3deD+KGR8GY+uzdEKummlhcLvoU1rZ+adoAkdz/FR2BJkCZz4M9UZOn2aqCfo YyvCSz05DGQaHtVxYj6RnwyuP1MjbyI0tLrSQpCClZ5r/Td/EnC02PIm62PpdA== 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 4NQy0B6CVFz1C0J; Mon, 5 Dec 2022 21:50:34 +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 2B5LoYqh093038; Mon, 5 Dec 2022 21:50:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B5LoYaY093037; Mon, 5 Dec 2022 21:50:34 GMT (envelope-from git) Date: Mon, 5 Dec 2022 21:50:34 GMT Message-Id: <202212052150.2B5LoYaY093037@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: 02c5770995e3 - stable/13 - heimdal: Add additional checks for bad kadmind input 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/13 X-Git-Reftype: branch X-Git-Commit: 02c5770995e3769f692ec57c6d20c8229e7b4df3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=02c5770995e3769f692ec57c6d20c8229e7b4df3 commit 02c5770995e3769f692ec57c6d20c8229e7b4df3 Author: Cy Schubert AuthorDate: 2022-11-30 23:53:49 +0000 Commit: Cy Schubert CommitDate: 2022-12-05 21:50:28 +0000 heimdal: Add additional checks for bad kadmind input Check return codes for bad input. (cherry picked from commit d24b27283290e404dfa2bf38cd0769e92092e384) --- crypto/heimdal/kadmin/server.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/crypto/heimdal/kadmin/server.c b/crypto/heimdal/kadmin/server.c index ed6ba5a1f790..19dfd89d521a 100644 --- a/crypto/heimdal/kadmin/server.c +++ b/crypto/heimdal/kadmin/server.c @@ -428,9 +428,11 @@ kadmind_dispatch(void *kadm_handlep, krb5_boolean initial, krb5_store_int32(sp, ret); if(ret == 0){ int i; - krb5_store_int32(sp, n_princs); + if ((ret = krb5_store_int32(sp, n_princs))) + goto fail; for(i = 0; i < n_princs; i++) - krb5_store_string(sp, princs[i]); + if ((ret = krb5_store_string(sp, princs[i]))) + goto fail; kadm5_free_name_list(kadm_handlep, princs, &n_princs); } break; @@ -451,7 +453,7 @@ fail: krb5_store_int32(sp, ret); krb5_storage_to_data(sp, out); krb5_storage_free(sp); - return 0; + return ret; } static void