From nobody Wed May 15 22:12:48 2024 X-Original-To: dev-commits-ports-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 4VfnXc30Ccz4tBVq; Wed, 15 May 2024 22:12:48 +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 4VfnXc2VDNz4CnN; Wed, 15 May 2024 22:12:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715811168; 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=/vowoNC2/VDY37CYLYopC9Sxfor8nw8EnhWahsrsOQs=; b=Fx3SPWPq5LzbbIYxDuEoBjzxhmf2b0q4EgVnZZ2iRTQ4+KSezHYvrXThhBWX1yl6jl3iia D62RL+mwqNAosIWR+s1ysD0atO3E+ttWZTwm5nyjAeYmW716HdQWul4zlHmZtAiBKKDo6h gKa6rg+E6xFwmwNgO+c5v905MvzdL1+V04NS7c2Tgbcc9tkIb1GN7d13evRvX+mddx28eP tOoiQIMJ/byb/CGVGm5w4VjosutwaAsLkg45xj42od1KQosFnZZis0Z44Y4MLjltYHi1uo e4UZApSwFE+d7haK2y/XtJG1YqxEbFNgsZlc7gG0nKzlXqanbCFZhmCZIJnqlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715811168; a=rsa-sha256; cv=none; b=qUaiBHBUPDdjnaH4DhxdnEyoMCKNMy2FYcSOzXzUI1y7Xh/qA4fhIIhdZholapilWfm/EN f5x6kEmM3AsY9Mq0OURes9ChLUVgTwaHK/MzZsfjlig1zuo1aEyGLsNRP3JrceTO+AH5Eb emGSWUMP2d1R9rr7XtCyAJ0uE2w2vAsTOeQN2vVdgL7rXGu62FyjOfR+cRiwAxnBVy0msB eC1ZwB3c9Lnyi4YOYyCo3zDeDN+ATtq6qs4JFdl5INPk8i7GtwD67yA+7cgik6xKFx4Dwg mL4j9hzKHHlN7ANq8v+97JK18/4YOe4eIdJ2Eh0b2akRuULT0Tebf3L5seZTNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715811168; 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=/vowoNC2/VDY37CYLYopC9Sxfor8nw8EnhWahsrsOQs=; b=bVfmeUdv7LvUOFAmB/gTvkMulnEmzLaDtE8xXzqWoZEsr2qYXiMsK8tCMn5Z+AIb1gNtUm UdkVBlOUTsaFHpuvKFVlRC8UAu0eaVvDY5VWSxa8KvqsbffGYln6bd2mQywLXFIC5eGTZU DRDcZkWZPBXV21D7UkxTXM+fC1D5GHX5VAqdBnx6P0xASiOw+j63N4OsbEzQWE2ag1Ch9d SXFZFXrt2jV3N0kUucIKhXnk5MJyUqMqG7hrnqp/m+Lq9iYg7sl2sBeYsJ+cIUK/GZbQDR YTHIVMkUBPcVnn757puxoXJXmPuV7iRJHVoPpaRUQUVWD8w6U+OAk/qYcDTzRQ== 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 4VfnXc25BKzYj4; Wed, 15 May 2024 22:12:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44FMCmff000275; Wed, 15 May 2024 22:12:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44FMCmO6000272; Wed, 15 May 2024 22:12:48 GMT (envelope-from git) Date: Wed, 15 May 2024 22:12:48 GMT Message-Id: <202405152212.44FMCmO6000272@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: d80a1943a8dd - main - sysutils/cdrdao: Fix zero length DMA with ata(4) List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d80a1943a8ddb184de2a4e78ba3efc0eafb5e133 Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=d80a1943a8ddb184de2a4e78ba3efc0eafb5e133 commit d80a1943a8ddb184de2a4e78ba3efc0eafb5e133 Author: Jason E. Hale AuthorDate: 2024-05-15 21:58:18 +0000 Commit: Jason E. Hale CommitDate: 2024-05-15 22:12:30 +0000 sysutils/cdrdao: Fix zero length DMA with ata(4) Fix zero length DMA transfer attempted failures with the ata(4) driver. This does not seem to affect users of the ahci(4) driver. While here, convert bzero/bcopy to memset/memmove, respectively. PR: 277115 Reported by: Benjamin Jacobs --- sysutils/cdrdao/Makefile | 2 +- .../cdrdao/files/patch-dao_ScsiIf-freebsd-cam.cc | 29 ++++++++++++++++++++++ sysutils/cdrdao/files/patch-trackdb_FormatMp3.cc | 11 ++++++++ 3 files changed, 41 insertions(+), 1 deletion(-) diff --git a/sysutils/cdrdao/Makefile b/sysutils/cdrdao/Makefile index 9bcc5a62a116..b968d34fd8a1 100644 --- a/sysutils/cdrdao/Makefile +++ b/sysutils/cdrdao/Makefile @@ -1,6 +1,6 @@ PORTNAME= cdrdao DISTVERSION= 1_2_5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils audio MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/rel_${DISTVERSION}/ \ SF/${PORTNAME}/rel_${DISTVERSION} diff --git a/sysutils/cdrdao/files/patch-dao_ScsiIf-freebsd-cam.cc b/sysutils/cdrdao/files/patch-dao_ScsiIf-freebsd-cam.cc new file mode 100644 index 000000000000..6b39efbe9ab9 --- /dev/null +++ b/sysutils/cdrdao/files/patch-dao_ScsiIf-freebsd-cam.cc @@ -0,0 +1,29 @@ +--- dao/ScsiIf-freebsd-cam.cc.orig 2023-01-25 14:30:35 UTC ++++ dao/ScsiIf-freebsd-cam.cc +@@ -112,11 +112,11 @@ int ScsiIf::sendCmd(const unsigned char *cmd, int cmdL + { + int retval; + int flags = CAM_DIR_NONE; +- u_int8_t * data_ptr; +- size_t data_len; ++ u_int8_t * data_ptr = NULL; ++ size_t data_len = 0; + +- bzero(impl_->ccb, sizeof(union ccb)); +- bcopy(cmd, &impl_->ccb->csio.cdb_io.cdb_bytes, cmdLen); ++ memset(impl_->ccb, 0, sizeof(union ccb)); ++ memmove(&impl_->ccb->csio.cdb_io.cdb_bytes, cmd, cmdLen); + + if (dataOut && dataOutLen > 0) { + data_ptr = (u_int8_t*) dataOut; +@@ -176,8 +176,8 @@ int ScsiIf::inquiry() + int i; + struct scsi_inquiry_data inq_data; + +- bzero(impl_->ccb, sizeof(union ccb)); +- bzero(&inq_data, sizeof(inq_data)); ++ memset(impl_->ccb, 0, sizeof(union ccb)); ++ memset(&inq_data, 0, sizeof(inq_data)); + + scsi_inquiry(&impl_->ccb->csio, + DEF_RETRY_COUNT, diff --git a/sysutils/cdrdao/files/patch-trackdb_FormatMp3.cc b/sysutils/cdrdao/files/patch-trackdb_FormatMp3.cc new file mode 100644 index 000000000000..7b8da328df14 --- /dev/null +++ b/sysutils/cdrdao/files/patch-trackdb_FormatMp3.cc @@ -0,0 +1,11 @@ +--- trackdb/FormatMp3.cc.orig 2023-02-03 14:46:06 UTC ++++ trackdb/FormatMp3.cc +@@ -111,7 +111,7 @@ FormatSupport::Status FormatMp3::madInit() + + // Initialize libao for WAV output; + ao_sample_format out_format; +- bzero(&out_format, sizeof(out_format)); ++ memset(&out_format, 0, sizeof(out_format)); + out_format.bits = 16; + out_format.rate = 44100; + out_format.channels = 2;