freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

multimedia/linux_dvbwrapper: Add error handling for copyout() calls

Browse Source 
The base system will soon require all copyout() calls to have explicit
handling of return values.

PR:		275986
Approved by:	antoine
This commit is contained in:
Mark Johnston 2024-01-02 13:21:22 -05:00
parent 823c8faa75
commit e6728be275
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
multimedia/linux_dvbwrapper-kmod/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= linux_dvbwrapper-kmod PORTNAME= linux_dvbwrapper-kmod
PORTVERSION= 1.0 PORTVERSION= 1.0
PORTREVISION= 1 PORTREVISION= 2
CATEGORIES= multimedia CATEGORIES= multimedia
DISTFILES= # none DISTFILES= # none

31
multimedia/linux_dvbwrapper-kmod/files/patch-linux__dvbwrapper.c
View File

@ -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 +++ linux_dvbwrapper.c
@@ -38,10 +38,7 @@ __FBSDID("$FreeBSD$"); @@ -37,11 +37,8 @@
#include <sys/sysproto.h> #include <sys/sysproto.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <sys/resourcevar.h> #include <sys/resourcevar.h>
- +#include <sys/capsicum.h>
-#if __FreeBSD_version > 900040 -#if __FreeBSD_version > 900040
-#include <sys/capability.h> -#include <sys/capability.h>
-#endif -#endif
+#include <sys/capsicum.h> -
#include <vm/vm.h> #include <vm/vm.h>
#include <vm/pmap.h> #include <vm/pmap.h>
#include <vm/vm_extern.h>
@@ -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);