From nobody Thu Oct 27 00:25:41 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 4MyRKf0Sq3z4gWk3; Thu, 27 Oct 2022 00:25:42 +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 4MyRKd6jfYz3C9V; Thu, 27 Oct 2022 00:25:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666830341; 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=w/3vctjSe+RE0c/3AMkQs44meJtXpxDwGn/x5+8ygiA=; b=ygrfOa8L8tZ8qQUPqxwdYFs5vH/xXtWagFYsK+BU8j1NSUgr/AjFNfEjb97FiTBVWD3X1s H4hwU5YD44l8o5LpYMjX1c14QSDTWv8dAIRTRAZZFrk/qwMAg0o1iDQe5EJzrdz0k/UycB j7LUKVBOgTKwmcRMQVHPv1v7VvztcST+6GaSvw08Ijz9UJOBnVRnSG7IlRBT0fQQ8XhcX3 zNXOyrqvqhFrYDwOcJWVwm2VzNNbXUAIR/6BxPadLwRxfqold/c9NQyx/K/u7NOoeJ5nCP FmbNCWa84kTq8pcloy+zCjaKMKrMhP39Dto56y4r90KtiJ1V6y8KIS6u4jzDXQ== 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 4MyRKd5mmszcVY; Thu, 27 Oct 2022 00:25:41 +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 29R0PfD6034042; Thu, 27 Oct 2022 00:25:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29R0PfXU034041; Thu, 27 Oct 2022 00:25:41 GMT (envelope-from git) Date: Thu, 27 Oct 2022 00:25:41 GMT Message-Id: <202210270025.29R0PfXU034041@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 2b25564af6f9 - stable/12 - OpenBSM: fix free() in au_read_rec error case 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 2b25564af6f9d1303fb92b8dfd3a36f5d7fc3c34 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666830341; 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=w/3vctjSe+RE0c/3AMkQs44meJtXpxDwGn/x5+8ygiA=; b=soGfgDV3FtOS80Aqjoubr4cGnIu6iBXvvL05G/vAhht7nAlc7aQZoQ7wmD5PkQIegxlUse A+dGMxBoomLJHN3qwhAcqAxW77Be9oX9CuktqAqoJZzPlOaMAwSneM/X4V88pFYzKpoAc1 Bsa8cn+cmOrm+4GRE3r5H0mlYfHNe3PECxCU7hjgfN5NMpQD193A78cKECuuPjoNrih3lx ucOoxLdPHCkWP27jelQQw7NHfJDAMMIqv4xO0bDT8RHyOz//L/kvihBS2Qi9MKjKuEmKWU 8DZ4oCyHpcKAqe40Y+KZLb5RYAlJYV7q7CjsjtCKsGxgvX06jh1SaHsN9cwgnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666830341; a=rsa-sha256; cv=none; b=Te3PRo6O4KC92+1gz2jAjOmkA5qZXZ/iiKZjmIvMp0p2LOOyooMBlHKt3UtlOaUxngjwmY tmGUomkAAUdHVeSZZXv2V2Zln8NXxvba2NMoN/s48U7RjdCoPJCeO7FdTa8zNIjV5Fe/pI 5cuyMR1RUiDdNIpuxLpj+g1CUnYcGqS+iGfsmi5WqPdAsSsSwDna0o+slTC1voy3Q0Nu9N 3YrdDhoN2SJ+nedGfq7jR+0GIwIbaWJMqXnCIqrt/BWmbE5/z8CwikMjNbTL6E+Qt2Gtff ArFjOXbLQoFx+h0K0RrXSpimyGKZkuV7itIOywB4MfR4FmzY15Q9bn3asqtQGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2b25564af6f9d1303fb92b8dfd3a36f5d7fc3c34 commit 2b25564af6f9d1303fb92b8dfd3a36f5d7fc3c34 Author: Ed Maste AuthorDate: 2022-10-24 13:45:59 +0000 Commit: Ed Maste CommitDate: 2022-10-27 00:25:33 +0000 OpenBSM: fix free() in au_read_rec error case buf is a char ** and *buf is the allocated buffer. PR: 267050 Reported by: Robert Morris MFC after: 3 days Sponsored by: The FreeBSD Foundation (cherry picked from commit c61b3f7de9a0a39d2bc78e3e78d148c369e706a5) (cherry picked from commit 889dcb5e9b2ff4160c313b31cfa53106af2a5b0c) --- contrib/openbsm/libbsm/bsm_io.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/openbsm/libbsm/bsm_io.c b/contrib/openbsm/libbsm/bsm_io.c index 43cf7e9990c1..4b89ccb8b59c 100644 --- a/contrib/openbsm/libbsm/bsm_io.c +++ b/contrib/openbsm/libbsm/bsm_io.c @@ -4597,7 +4597,7 @@ au_read_rec(FILE *fp, u_char **buf) if (fread(bptr, 1, ntohs(filenamelen), fp) < ntohs(filenamelen)) { - free(buf); + free(*buf); errno = EINVAL; return (-1); }