From nobody Wed Jan 03 01:00:58 2024 X-Original-To: dev-commits-ports-main@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 4T4WcV4kqLz56Hq4; Wed, 3 Jan 2024 01:00:58 +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 4T4WcV35BBz3f2d; Wed, 3 Jan 2024 01:00:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704243658; 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=YWAl9djvlUU8QQwou/DdEq9HbDnCIxhNzmEqGS4zPgI=; b=bFyLOI7+fJgRUB7ud5EC6dB2pHVghitnrBr7qSBH80Fo5+gyKgQjxOUkwUXEKkxq3K9CG1 hsYdrxUJHpt7xF9ij+jou9Lmxo8Zofevoa6qXK4gKrFIKKwEH2em7u3hv9pcDlt6NlDxl3 efjU9a8tDTJ+/11Nkx9Aa+wDogT1F+9xTabmzVP1K+f3txxHjrwCc6PG3/dHdt2Pyhwasx mUIS93+KkgnD3Tzc8Cf5LUjFnVz11T6On/qIbJ4KpJjodq5Qtsenag0tLm95wrzF149YGV w7qqfulCLCU1KCGamHUBiUW1JAS9TB15HzU8o/s3Gl0WZ2fgpiCrmQEj9ThT+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704243658; a=rsa-sha256; cv=none; b=gz1TZNodCrXnpp1sJEN+iP/h8j0WbrjXJUcZRFKWreYQBuLC6o2bVZNzX4WZjSmiKjkY6E g20QKOPwDnzqBM8bO4MOXpVV90Bzodu30EPQD27DYio1B+zPV+N4UQ0LcMjpZlOmCOEeRP rL9IXsbGFAeOzpCw1WaiGMfOt/1kVa1a2mDD1AKcgvnjqIh2xuT3VDM/SRrnAokArrRIRx NUuWB5oyUDZyhU+uQVpgRsioqi78dUHasVGse7EAAtsJBH+IzOriG4SzO4Jv+V9OHjil/v A4AqFVQz07oxh9MsLisvri3cGoxB0QAgDcVdGcS6pEpw95LFndIbE2EpNukGfA== 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=1704243658; 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=YWAl9djvlUU8QQwou/DdEq9HbDnCIxhNzmEqGS4zPgI=; b=j+ntR799mK1u2qiuJNGu79rhOrc9Pc+uJ0O0I01MnS3VOManEY//D2JGsT+nEaTYD7WQEq zhcn8beZtQgceBc3wocIWSPnh3iBEJPVgfelkb1BYaNOuYRcsgpKwMBJZlihwG1MeZTqcP rIMgf9sbgJM8+/UGoq53DxM0uTQsjML5uQJAQa8cxz4Pdnp1E8WjLtajpvdZgysS+MOT2n p4P3i0tgTzZCoTq+OzhO8swqW08AQQqA2OgWRfYSI/GSPR8+W4rOSVFf+reEcHXQegGL04 69zNXZD4cc5iVV5oJhZEF00rM0OAgxC2i8R5QCrw9musQ1EMmE/j01Ik3LvuCg== 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 4T4WcV2CCPz1NT3; Wed, 3 Jan 2024 01:00:58 +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 40310whB050949; Wed, 3 Jan 2024 01:00:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40310wQW050946; Wed, 3 Jan 2024 01:00:58 GMT (envelope-from git) Date: Wed, 3 Jan 2024 01:00:58 GMT Message-Id: <202401030100.40310wQW050946@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: e6728be27592 - main - multimedia/linux_dvbwrapper: Add error handling for copyout() calls List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: e6728be27592820616fb830006265b973d1764d1 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/ports/commit/?id=e6728be27592820616fb830006265b973d1764d1 commit e6728be27592820616fb830006265b973d1764d1 Author: Mark Johnston AuthorDate: 2024-01-02 18:21:22 +0000 Commit: Mark Johnston CommitDate: 2024-01-03 01:00:31 +0000 multimedia/linux_dvbwrapper: Add error handling for copyout() calls The base system will soon require all copyout() calls to have explicit handling of return values. PR: 275986 Approved by: antoine --- multimedia/linux_dvbwrapper-kmod/Makefile | 2 +- .../files/patch-linux__dvbwrapper.c | 31 ++++++++++++++++++---- 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/multimedia/linux_dvbwrapper-kmod/Makefile b/multimedia/linux_dvbwrapper-kmod/Makefile index d0259b063fbc..6e9aac435155 100644 --- a/multimedia/linux_dvbwrapper-kmod/Makefile +++ b/multimedia/linux_dvbwrapper-kmod/Makefile @@ -1,6 +1,6 @@ PORTNAME= linux_dvbwrapper-kmod PORTVERSION= 1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia DISTFILES= # none diff --git a/multimedia/linux_dvbwrapper-kmod/files/patch-linux__dvbwrapper.c b/multimedia/linux_dvbwrapper-kmod/files/patch-linux__dvbwrapper.c index fa16b8afa9f6..5c36be1ffd28 100644 --- a/multimedia/linux_dvbwrapper-kmod/files/patch-linux__dvbwrapper.c +++ b/multimedia/linux_dvbwrapper-kmod/files/patch-linux__dvbwrapper.c @@ -1,14 +1,35 @@ ---- linux_dvbwrapper.c.orig 2017-02-01 19:40:17 UTC +--- linux_dvbwrapper.c.orig 2024-01-02 18:20:10 UTC +++ linux_dvbwrapper.c -@@ -38,10 +38,7 @@ __FBSDID("$FreeBSD$"); +@@ -37,11 +37,8 @@ #include #include #include -- ++#include + -#if __FreeBSD_version > 900040 -#include -#endif -+#include - +- #include #include + #include +@@ -299,7 +296,9 @@ linux_ioctl_dvb(struct thread *td, struct linux_ioctl_ + error = copyout_map(td, &uvp, propsiz); + if (error) + goto out2; +- copyout(vp, (void *)uvp, propsiz); ++ error = copyout(vp, (void *)uvp, propsiz); ++ if (error) ++ goto out2; + + #if __FreeBSD_version > 1000051 + error = fget(td, args->fd, +@@ -330,7 +329,7 @@ linux_ioctl_dvb(struct thread *td, struct linux_ioctl_ + for (i = vps.num, l_p = l_vp, p = vp; i--; ++l_p, ++p) + bsd_to_linux_dtv_property(p, l_p); + linux_to_bsd_dtv_properties(&l_vps, &vps); +- copyout(l_vp, (void *)vps.props, l_propsiz); ++ error = copyout(l_vp, (void *)vps.props, l_propsiz); + + out: + fdrop(fp, td);