From nobody Mon Oct 24 13:49:52 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 4MwxJx0QN8z4fSMB; Mon, 24 Oct 2022 13:49:53 +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 4MwxJw6vfyz3Dfg; Mon, 24 Oct 2022 13:49:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666619393; 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=J7DiJ4mkICY+bAdbKTd9RinIRt0Ra/kpYXz2vucockc=; b=GiLGsUlQza/zGbksr9fKKn2z0piDZ0QF9A8oLTlDL5YRbuVpMB5+1pWXW/kkKfKN/rTZ4V 5fn0gOz9bMaqBQBa93oJenlEKPeM2cf5hN3W9KAx2+dFW4HmGVG4cezBVmEgpq2X+McTsH swhv0i7as5f0n74nPXTMeCRMGlbfGiHDB5AQ5BfAsK/AVTb6CEDE5qHytIS3TgC8DSnWNu kbGXYtPV32UJmGjbWrhAqAotTO3ykJPHaJ3PR3wHE8pjsLfraGBqrqHn/qwS0fZvOwI8OK U6g5tu1GTJWCVJLGbH8ZD36pkgup0X5h0o/kUs58rlVV7cfKkJtSXzcjAaoXKQ== 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 4MwxJw5zPbzG02; Mon, 24 Oct 2022 13:49:52 +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 29ODnqkc050739; Mon, 24 Oct 2022 13:49:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29ODnqTe050738; Mon, 24 Oct 2022 13:49:52 GMT (envelope-from git) Date: Mon, 24 Oct 2022 13:49:52 GMT Message-Id: <202210241349.29ODnqTe050738@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: c61b3f7de9a0 - main - 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/main X-Git-Reftype: branch X-Git-Commit: c61b3f7de9a0a39d2bc78e3e78d148c369e706a5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666619393; 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=J7DiJ4mkICY+bAdbKTd9RinIRt0Ra/kpYXz2vucockc=; b=PJCYZqpVsRY9VzUsQgb7zghcf5P8TIA9ZzD/V0CHUk5k2hH0J+9whPcM3fGNxUjzPqxCb/ 986hfwompt2w3NYmGlGcd2JOyJzI5MvRnPejg+wyN3+5YyR2zh7z4aWjrzN2HKE/T6g2Ee fm/a7CjvNTGUZ23oFvFzbBK6LO4kdIKXFHPkkp6UnzT1UWM9Q6YJN3D/Wn492Yb9aroh/4 2plKYZxYtaTPg7H2be19tMiCsggCQ2ZEFWjDImdz/8C4Tr8by0FaV4TQi12ORo75qVolbb glj4nQta/NI/KK88HKhl+LfE/LayMyJ8YF+qNVLKIcm5kfbhp+RXZz6hIjLbBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666619393; a=rsa-sha256; cv=none; b=CFF7zcrewCPfIKPTJVSQoiuXNC58eRxsO5BBSE3maZggHO0Aov2B1B60YcFos1q7+bF8x/ hoQN0ahVdRV5RQlo/jc/IlHmks3CEfJdxtWuG0VIB92LH9ooVoqUs3H881BXPuP7zp6K+b fHouCLykaOde5oa1uPXVs4Juqv3ZsCovf3Bf2uMte6eUUIvpHW3FLV5DmoijpCM9Lvgl0z xhigNgm/lXa+G8SzZk202OJ2RjA7S36UQ85OeHBY9DtjIxVAiq5fyD2Fh2r+AK2IcziUND esWwfUB2OF5HMnVylc3j/LTX7NdmWOkBhBx/DxqYTsaK9ovDS4yzxubBbtPpSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c61b3f7de9a0a39d2bc78e3e78d148c369e706a5 commit c61b3f7de9a0a39d2bc78e3e78d148c369e706a5 Author: Ed Maste AuthorDate: 2022-10-24 13:45:59 +0000 Commit: Ed Maste CommitDate: 2022-10-24 13:49:30 +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 --- 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); }