From nobody Wed Oct 30 13:21:11 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 4Xdnng5Z2Lz5bMH3; Wed, 30 Oct 2024 13:21:11 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xdnng56lnz4hwT; Wed, 30 Oct 2024 13:21:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730294471; 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=HhrabnpZmQ93ZJ+q8aZKKazYDZNSwvzPZznrWGy3AOs=; b=BZmykwCpWpCxSgXMX9qQ8CRZePohLvZwYFN/28uBhsN/DobUi+wYANrFel7BpmtGyrruWK WOA/V4QKrtr3L9jkDI5TAIexp+94h/kR2IXrCNuczyFKb0VY2DbKYgvVGrHQhzUhecXVSV vRBH31dvML2iKpYMVrBxnE3NV9mTDS15ajwAmMZw2mV2fiZkgrkZma1r3lNuGiBeW8S/K9 SE/NYJ4yt4p4aLQW2keZL6bUvIa0X9zPKPahHeXQg+o+WzuO4oiF+yJNtHE7mU23RqwveZ tUPTK9dFuXcxQdR5oyxB3xw9XMfS+rgaLs63i0++nVwaieivLdVYK/K2/a6/xg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730294471; 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=HhrabnpZmQ93ZJ+q8aZKKazYDZNSwvzPZznrWGy3AOs=; b=EH8T6K6dtVjfOuocurNtjN6vvJU/R9ViRZ0Xbo4PwsEf3tcERLUuGqFhlfXoR1pldvKNdr 7WftfgTvRBDZv9amu7J5LXKG8mXSXpJT3kR7Y43ABwwBqbRWWXr9vJIl6PkTVvQY/NY+xX fXJmuT/bn/2n+p4EV93/A62TyCjA3Kc6c31yhkWAYZKQdlmUTn8d64TLXVD8m6fpL7RpuR 2iHAgo+xvUiS+FtmyPDGFH/+RyhBTm5tpOs15P1J9ygapQXGrA+QXBsjxh7ccxT4W5OT7E aECxJkgiK2wm59mFYq31Dal5PIyIoac47DB6XE2y8/BTd1qQE6+Cm9RhZ9H7fg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730294471; a=rsa-sha256; cv=none; b=SWUYEQlmvzkI3QgqVxnoYF9CvNgLECjeLApV1n8yw4eo/D90MliF/ebD2O+/8nUE2w0TRU Bp2WSir29dWR5iCDSioLyhZ+aNNHNSKWp9Jg2ObYhFWn4Cj+DxxiZLVkkjKs17poTDyM4E as06DFWqbP90jiYpODvzPohm3zXpNKxxS8qgjpEUqv2FWUHIZQUUlY0UC6C3mAQqZHg0DM nVtj/nDzdSK0dyy06Dk7p3aCuTOqKjpDtOLf3SerfqwSXT7EhTmADsvseIU9zLuhSvgfsz 4LsJQ/DvrgyZdFtsg/Lb4BnmqKP/9trbIYIi8J10f9sXF7RgzACszhOC+y7O8w== 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 4Xdnng4kbjz18PP; Wed, 30 Oct 2024 13:21:11 +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 49UDLB2h087492; Wed, 30 Oct 2024 13:21:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49UDLB2f087489; Wed, 30 Oct 2024 13:21:11 GMT (envelope-from git) Date: Wed, 30 Oct 2024 13:21:11 GMT Message-Id: <202410301321.49UDLB2f087489@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: bf2145f361b8 - stable/14 - mixer: Fix a bogus free() call in the main loop 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: bf2145f361b8b19573648add42817fae57f4be53 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=bf2145f361b8b19573648add42817fae57f4be53 commit bf2145f361b8b19573648add42817fae57f4be53 Author: Mark Johnston AuthorDate: 2024-10-23 16:55:39 +0000 Commit: Mark Johnston CommitDate: 2024-10-30 13:21:06 +0000 mixer: Fix a bogus free() call in the main loop After a strsep() call, p might not point at the original allocation anymore. Reported by: CHERI Reviewed by: christos MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47266 (cherry picked from commit c22be0b181e954a4cc00ed4f5c7df974f3061c3c) --- usr.sbin/mixer/mixer.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/usr.sbin/mixer/mixer.c b/usr.sbin/mixer/mixer.c index 468130ddaa88..70a35f71b25f 100644 --- a/usr.sbin/mixer/mixer.c +++ b/usr.sbin/mixer/mixer.c @@ -147,7 +147,9 @@ main(int argc, char *argv[]) parse: while (argc > 0) { - if ((p = strdup(*argv)) == NULL) + char *orig; + + if ((orig = p = strdup(*argv)) == NULL) err(1, "strdup(%s)", *argv); /* Check if we're using the shorthand syntax for volume setting. */ @@ -200,7 +202,7 @@ parse: /* Input: `dev.control=val`. */ cp->mod(cp->parent_dev, valstr); next: - free(p); + free(orig); argc--; argv++; }