From nobody Sat Feb 05 16:27:27 2022 X-Original-To: dev-commits-src-branches@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 33594198CFB6; Sat, 5 Feb 2022 16:27:28 +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 4Jrd9D28gXz3PN2; Sat, 5 Feb 2022 16:27:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644078448; 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=PTaigxt2/e4OrfuFWufE85dAHcgVfbZ6P5zXajgx9CQ=; b=wG3j5PF+gUssqoX1tqSoZiVWVvXB1VHhYBJpHOY7IwSuJdpHxzb+XtVFLI6JFhTriIojJ1 im4Wsgu8liYFvFm6hNuQdOLwRsv3e1HE7/dOUYXqxAUZqjkHj2bqmwi+44J4dZro2J+HwO qfrzbK1APh779d4F+KMSIeG6WwAWRysA0R2npgAAG15kDyYHInGrR0Pa+YNWtq65DK+BZ0 FlpQXq/PXQ89HkrvVr5RzCFGLlKA3T+hcH+ZrXm/saJCsdPopMnvh7tN30UulFg+ai8tC1 jFwksxTeW8v/RgGsU2ALg+mAfcpbUU0/2G+n0nanpbFWwmxwyPRrF1zTt9p6Lg== 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 19C522226C; Sat, 5 Feb 2022 16:27:28 +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 215GRRgx038784; Sat, 5 Feb 2022 16:27:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 215GRRch038783; Sat, 5 Feb 2022 16:27:27 GMT (envelope-from git) Date: Sat, 5 Feb 2022 16:27:27 GMT Message-Id: <202202051627.215GRRch038783@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: 647d3bf17cd9 - stable/12 - dma: exit if invoked with invalid (zero) argc List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 647d3bf17cd907ded624dccf4fe4567924c4f399 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644078448; 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=PTaigxt2/e4OrfuFWufE85dAHcgVfbZ6P5zXajgx9CQ=; b=QF6oKqfZnFlwiZIZ/5jN+p6ThOhAaVXobvzJa3UI8Kchs5kSnnmDIKk39+iAEbHHIVVhR7 n7HkJ90zHVZ7wdcEhVjDbuwtVUP/QCNUc3H99gz6GGdGdeo9obq1Nd7iytTsgNWJuR1AB1 /ggtnZZzOYFl4f2KR3SiaZ1SG2gC3v25R6/Kvi1MfHptyJu2PaLGYN8nV1B6dSTNGoxbWJ Hb+rOKDb7Sea3QopUcF6vIo6nSKhSbd+AaVqgtJEnX3odHz8gZdaXW/paHWmaoDF8O4J8b HeBzpF6RzrFHRF1iQt+rBi2ivrmZt6x4xnOb0OzWod1zuyH79w5aZzu2CV/hMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644078448; a=rsa-sha256; cv=none; b=SE2Bfxc7FzUtMDxI3a1fisRIhcgq8iBpHXnm8F27WYNf63HiqGIO1y8yWcZ46riA405Etp vf5PCenPNTaX8CiF/3zI/beFPQbyzm1t3cj+GtbdfNH7u0YBu7wiP5kvtuyj35fTcs33E2 mD9eO54/wD45n+efu9ZaeR3kDT9Qin4bgQ08lvm4uZygIR9YZiXh8OG1NuJr67kXa41K2q gzdyAIX6dboX5MPFS0fKQ/BDdNP7VFKX4uAAJPgPbYNQ5E7NYUknOvvkqIew6uDh1ou9Os WjAuDHbZEl1nDo/BsAtX0G3/Ja6CrB9LgsgvsKEJ+hXt25vSeCk5yxCRg2iCwQ== 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=647d3bf17cd907ded624dccf4fe4567924c4f399 commit 647d3bf17cd907ded624dccf4fe4567924c4f399 Author: Ed Maste AuthorDate: 2022-01-28 22:15:02 +0000 Commit: Ed Maste CommitDate: 2022-02-05 16:26:14 +0000 dma: exit if invoked with invalid (zero) argc This was prompted by the recent pkexec vulnerability (CVE-2021-4034). This change is being made on general principle for setuid/setgid binaries and is not in response to an actual issue. Reviewed by: kevans, markj (both earlier) MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D34087 (cherry picked from commit 1c91aedf25bce879a8aced6439200e46601eb8a4) --- contrib/dma/dma.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contrib/dma/dma.c b/contrib/dma/dma.c index 72115ae2b55e..7cad25a214ee 100644 --- a/contrib/dma/dma.c +++ b/contrib/dma/dma.c @@ -428,6 +428,9 @@ main(int argc, char **argv) int nodot = 0, showq = 0, queue_only = 0, newaliases = 0; int recp_from_header = 0; + if (argc == 0) + errx(EX_OSERR, "invalid argc"); + set_username(); /*