From nobody Wed Jan 3 17:00:21 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 4T4wvV05Grz56Gb4; Wed, 3 Jan 2024 17:00:22 +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 4T4wvT6CCRz4mhZ; Wed, 3 Jan 2024 17:00:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704301221; 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=jsZv2c7dy/rlKBptk7HomxmxyNtyZERahMBuH3AxjF8=; b=mPP3cN3uZlWjFjUbWgF0CeIhF2v6GWxjgMrYekVpfoSqf6qIIaZzrAOuuXrn+EjePZrxmC +ep729rTy1wyAGSTT6jowc3+1GWUjzZHTZ/tMhs2hKE/B/fxKPMIBcbDrraMpH+qO06Q3q E74yGg9Fk1RqXj2bWJH+kVXUX8cMli5w7swpDungiqK/V2mLOXzxw+MKGobourGL2I73BR ROUhUZAYMi5EPgoNH80rXDXkZgfTE9scoB1CtVBGvr9WFSLYjW2FJ5qaKFh9YGYEnZG6EA e9ojsT8A5JjEmMB3wZ74AIPLqY8LzWWM/Z4oNPlkTUCZiLQVgyZgWaTHqpXQcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704301221; 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=jsZv2c7dy/rlKBptk7HomxmxyNtyZERahMBuH3AxjF8=; b=LEdIL5SLxfRBpXRBYisSzhCat3/FZKKz1BLd5wi6v8Gmoh2HhA+TQJBgENfLnbnTDfE/EZ tblFTGzMU7c2glRktePpaoYAlZmYkBLG307ZBwDgG0VzdJ7/FdmwEop8INot00tzmr2VFV ywJx6dA7p8OWi4wSU4mMbEe3kOLwWk+6aagycMLzjaoGI9AdAG+M+yX/C0EJzL8XPBbX4l EWrBHlW+tfEd3P0uLEEQnS7jGdnxwYPjB5F+1LiCSmFcXyza/W+WVCMmQL5DVWNfHLidTM wyj3rvmVl3v2FUkrauv/TXGnCJ7JEHmjtMONBmNvHqnHQJQLVSZuZSKdEfiTSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704301221; a=rsa-sha256; cv=none; b=R1D+N5v44uBA8qmNBiqnIqsqFEa2j5qlubRUTeXPOYJekIw3wEB9UT6Ng9r8OR6AkTjimz CilFCMEPEEJp6HSP/VfVLorABO0Ka66aDxrAS+SK+emVVlcJG0KrhKIuiy6esg2UOJwvuI NWul9QSWYEc+V/DOE37cquIvmtFmtvAKdqoO+cA9jdONY7d6xgy0STDYUliJ3s8mm2oZXv 0AhHuV02z6G4GoqG+2xFfHfOHsRvw6bga8Vq+oCYA7aUHUGf8kjnIythNDmx3iEtxRZ7Ha uK8qFcuhChgB4FPJPzcCmrGDcDvTKI03/BDbuF2wXo4ebEVtGKp03XcesCua3g== 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 4T4wvT5Gd4zsf3; Wed, 3 Jan 2024 17:00:21 +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 403H0L6K060017; Wed, 3 Jan 2024 17:00:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 403H0LeH060014; Wed, 3 Jan 2024 17:00:21 GMT (envelope-from git) Date: Wed, 3 Jan 2024 17:00:21 GMT Message-Id: <202401031700.403H0LeH060014@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mark Johnston Subject: git: eaa12eb57a42 - main - comms/opencbm-kmod: Add error handling for copyin() and copyout() calls 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-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: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eaa12eb57a422be10df72d567aea693dcafc6c19 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/ports/commit/?id=eaa12eb57a422be10df72d567aea693dcafc6c19 commit eaa12eb57a422be10df72d567aea693dcafc6c19 Author: Mark Johnston AuthorDate: 2024-01-03 16:58:37 +0000 Commit: Mark Johnston CommitDate: 2024-01-03 16:59:53 +0000 comms/opencbm-kmod: Add error handling for copyin() and copyout() calls This will be required soon as my intent is to annotate copyin() and related functions with __result_use_check. Moreover, the lack of error handling here is a real bug. The patch was submitted upstream as well. PR: 275986 Approved by: zirias Differential Revision: https://reviews.freebsd.org/D43273 --- comms/opencbm-kmod/Makefile | 1 + comms/opencbm-kmod/files/patch-compat-freebsd-14 | 34 --------------- comms/opencbm-kmod/files/patch-opencbm.c | 54 ++++++++++++++++++++++++ 3 files changed, 55 insertions(+), 34 deletions(-) diff --git a/comms/opencbm-kmod/Makefile b/comms/opencbm-kmod/Makefile index 3133ad28bae7..3432aa3f8f1a 100644 --- a/comms/opencbm-kmod/Makefile +++ b/comms/opencbm-kmod/Makefile @@ -1,5 +1,6 @@ PORTNAME= opencbm-kmod PORTVERSION= ${OCBM_VERSION} +PORTREVISION= 1 CATEGORIES= comms archivers MAINTAINER= zirias@FreeBSD.org diff --git a/comms/opencbm-kmod/files/patch-compat-freebsd-14 b/comms/opencbm-kmod/files/patch-compat-freebsd-14 deleted file mode 100644 index 81df83803f2f..000000000000 --- a/comms/opencbm-kmod/files/patch-compat-freebsd-14 +++ /dev/null @@ -1,34 +0,0 @@ -From 6e438c1b32d39e5238f65246e192c89b22fdfd82 Mon Sep 17 00:00:00 2001 -From: John Baldwin -Date: Fri, 20 May 2022 17:10:09 +0000 -Subject: [PATCH] FreeBSD kernel driver: compat with 14-CURRENT - -In 14-CURRENT (upcoming major release), there was a slight change to the -driver API at version 1400058. - -Add conditional code to retain compatibility. ---- opencbm.c.orig 2022-01-22 22:01:25 UTC -+++ opencbm.c -@@ -133,8 +133,6 @@ static struct cdevsw cbm_cdevsw = { - .d_name = CBM_NAME - }; - --static devclass_t cbm_devclass; -- - /* forward references for parallel burst routines */ - int cbm_parallel_burst_read_track(struct cbm_data *sc, device_t ppbus, - unsigned char *buffer); -@@ -930,7 +928,13 @@ static driver_t cbm_driver = { - sizeof(struct cbm_data) - }; - -+#if __FreeBSD_version >= 1400058 -+DRIVER_MODULE(cbm, ppbus, cbm_driver, 0, 0); -+#else -+static devclass_t cbm_devclass; -+ - DRIVER_MODULE(cbm, ppbus, cbm_driver, cbm_devclass, 0, 0); -+#endif - MODULE_DEPEND(cbm, ppbus, 1, 1, 1); - - /* diff --git a/comms/opencbm-kmod/files/patch-opencbm.c b/comms/opencbm-kmod/files/patch-opencbm.c new file mode 100644 index 000000000000..0a434630d63b --- /dev/null +++ b/comms/opencbm-kmod/files/patch-opencbm.c @@ -0,0 +1,54 @@ +--- opencbm.c.orig 2022-01-22 22:01:25 UTC ++++ opencbm.c +@@ -133,8 +133,6 @@ static struct cdevsw cbm_cdevsw = { + .d_name = CBM_NAME + }; + +-static devclass_t cbm_devclass; +- + /* forward references for parallel burst routines */ + int cbm_parallel_burst_read_track(struct cbm_data *sc, device_t ppbus, + unsigned char *buffer); +@@ -699,7 +697,7 @@ cbm_ioctl(struct cdev *dev, u_long cmd, caddr_t data, + break; + } + rv = !cbm_parallel_burst_read_track(sc, ppbus, sc->sc_buf); +- if (!rv) copyout(sc->sc_buf, val->buffer, BUFFER_SIZE); ++ if (!rv) rv = copyout(sc->sc_buf, val->buffer, BUFFER_SIZE); + break; + + case CBMCTRL_PARBURST_READ_TRACK_VAR: +@@ -710,7 +708,7 @@ cbm_ioctl(struct cdev *dev, u_long cmd, caddr_t data, + break; + } + rv = !cbm_parallel_burst_read_track_var(sc, ppbus, sc->sc_buf); +- if (!rv) copyout(sc->sc_buf, val->buffer, BUFFER_SIZE); ++ if (!rv) rv = copyout(sc->sc_buf, val->buffer, BUFFER_SIZE); + break; + + case CBMCTRL_PARBURST_WRITE_TRACK: +@@ -720,7 +718,9 @@ cbm_ioctl(struct cdev *dev, u_long cmd, caddr_t data, + rv = EINVAL; + break; + } +- copyin(val->buffer, sc->sc_buf, val->length); ++ rv = copyin(val->buffer, sc->sc_buf, val->length); ++ if (rv) ++ break; + rv = !cbm_parallel_burst_write_track(sc, ppbus, + val->buffer, val->length); + break; +@@ -930,7 +930,13 @@ static driver_t cbm_driver = { + sizeof(struct cbm_data) + }; + ++#if __FreeBSD_version >= 1400058 ++DRIVER_MODULE(cbm, ppbus, cbm_driver, 0, 0); ++#else ++static devclass_t cbm_devclass; ++ + DRIVER_MODULE(cbm, ppbus, cbm_driver, cbm_devclass, 0, 0); ++#endif + MODULE_DEPEND(cbm, ppbus, 1, 1, 1); + + /*