From nobody Sat Sep 28 03:55:02 2024 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 4XFtlB2P2yz5XhDY; Sat, 28 Sep 2024 03:55: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XFtlB1q2Zz4Rp1; Sat, 28 Sep 2024 03:55:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727495702; 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=SJV6EyIWFDO4IrqOf3Pem/Oy1O/QWYRsvkpKyhWbOJI=; b=qB89BGdmf1yjHgScydGLAJewY7rU8zPNpphSNWD43fH8eIrDxMmLuWphTNjELS5HKW1LuP mp8iC5BH/qVQ2xMhfH7Le0uQEQXuw7VPrfktdx3U9JBYeAMjSBTaoSOFHOFSMkByFRk8tC YdcMgSZX1+GzMq558xW+vdFrlne60KuUWVrtrSrewWVLdSL2qEI9kv2voI/CMGwwIp4n+j dHoy7UsTmsX7ebawnWx22iv/GPwk9iQBiF7vms3PehZIICqzIIkSx4UtOdT1Gnz6s+e9ve K2E1FjhWAmwzFgb807eL+GGhmXkDGrSlEku1rpeGZIp+DmQA+Erp3UBUiE+amg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727495702; 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=SJV6EyIWFDO4IrqOf3Pem/Oy1O/QWYRsvkpKyhWbOJI=; b=o1Sv4WeDqgRO6UUYSNLRoV3BNA9wFAGCDyRetx1CamHBHofYn0etp1bWG/zh58nGG4R+N2 NbojY4/kZ99eMfEh7AWd64gVzFXYik/WnVVg4IOPOqRhah5OyzDVdySNmgJyuOVml1jigH J243BnXHvdLOfYMKVzEsTZkt1fP5bki1ACY+uQjiU3rTem7YhtnXJRalDuNxRfz6FEO3RL r802vCAXlEAQe7Zw6zHr1vdMz1VZrc87bjH5wGMvxzFbKIX5uNs6jl7h/7eyhpmuRC3OEc gUn420gOckNBn5GvnzWFl8d+fFqJ+185RuYPTkXXGhRXKprtZbQIA0QEK18vfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727495702; a=rsa-sha256; cv=none; b=xrMKaAxKRrTJnjgDfVtVInlvzZ9nN32MdZacMK3O26Zo3Fn6nQltwMBypW7GH7YV7SaGA8 jrhDqeWMCNFW+Q5yBjzoN95Bhw6ngMck2+DwB7PgClvk96Cdst9Lj78KGixaF7yopMTQho FXdUXsa/37mLRv4U4PmuCUL7oPJvLDwa0R91LBjb2fmUwnkRKhMScbAPZXgqufHrd0u/vF wmhC488pj5IINfAiZLSZZ27UwxNZmytlqy6cgOdHOJpMx36R/AzWBxJILWFiX76Ubj1hqh YzmmAl4QJMTFmEVW3nnazicN8+MPV0BniuD85NV8rxoRYDBDkm1O7gL7+uRl0Q== 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 4XFtlB1G2Hz17RM; Sat, 28 Sep 2024 03:55:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48S3t2Ao015021; Sat, 28 Sep 2024 03:55:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48S3t285015018; Sat, 28 Sep 2024 03:55:02 GMT (envelope-from git) Date: Sat, 28 Sep 2024 03:55:02 GMT Message-Id: <202409280355.48S3t285015018@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: c2dca1b5607f - stable/14 - radlib: fix a memory leak in `is_valid_request` 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c2dca1b5607fa4c69d5357c717c3b2dd359e2f26 Auto-Submitted: auto-generated The branch stable/14 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=c2dca1b5607fa4c69d5357c717c3b2dd359e2f26 commit c2dca1b5607fa4c69d5357c717c3b2dd359e2f26 Author: Enji Cooper AuthorDate: 2024-06-04 20:01:55 +0000 Commit: Enji Cooper CommitDate: 2024-09-28 03:54:48 +0000 radlib: fix a memory leak in `is_valid_request` Call `HMAC_CTX_free` if returning early from `is_valid_request` when processing `Message-Authenticator` tags. Reported by: Coverity MFC after: 1 week Fixes: 8d5c7813061d ("libradius: Fix input validation bugs") Differential Revision: https://reviews.freebsd.org/D45488 (cherry picked from commit 77c04f3eb12a560eb61252c817e4147bc0178e43) --- lib/libradius/radlib.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/libradius/radlib.c b/lib/libradius/radlib.c index 2049468f455f..cd1f1df1b234 100644 --- a/lib/libradius/radlib.c +++ b/lib/libradius/radlib.c @@ -321,8 +321,10 @@ is_valid_request(struct rad_handle *h) hctx = HMAC_CTX_new(); while (pos < len - 2) { alen = h->in[pos + 1]; - if (alen < 2) + if (alen < 2) { + HMAC_CTX_free(hctx); return (0); + } if (h->in[pos] == RAD_MESSAGE_AUTHENTIC) { if (len - pos < MD5_DIGEST_LENGTH + 2) { HMAC_CTX_free(hctx);