Attachment 193982 Details for Bug 228709 – Patch to fix nvidia driver memset(3) usage

[patch] Patch to fix nvidia driver memset(3) usage

nvidia-driver-memset.patch (text/plain), 2.80 KB, created by Ben Woods on 2018-06-04 04:21:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ben Woods

Created: 2018-06-04 04:21:58 UTC

Size: 2.80 KB

patch

obsolete

>Index: x11/nvidia-driver/Makefile
>===================================================================
>--- x11/nvidia-driver/Makefile	(revision 471470)
>+++ x11/nvidia-driver/Makefile	(working copy)
>@@ -66,12 +66,14 @@
> .if ${NVVERSION} < 355.006
> EXTRA_PATCHES=	${FILESDIR}/extra-patch-src-Makefile \
> 		${FILESDIR}/extra-patch-src-nv-freebsd.h \
>-		${FILESDIR}/extra-patch-src-nv-misc.h
>+		${FILESDIR}/extra-patch-src-nv-misc.h \
>+		${FILESDIR}/extra-patch-src_nvidia__subr.c
> NVSRC=		.
> .else
> EXTRA_PATCHES=	${FILESDIR}/extra-patch-src_nvidia_Makefile \
> 		${FILESDIR}/extra-patch-src_nvidia_nv-freebsd.h \
>-		${FILESDIR}/extra-patch-src_nvidia_nv-misc.h
>+		${FILESDIR}/extra-patch-src_nvidia_nv-misc.h \
>+		${FILESDIR}/extra-patch-src_nvidia_nvidia__subr.c
> NVSRC=		nvidia
> .endif
> .if ${NVVERSION} >= 358.009
>Index: x11/nvidia-driver/files/extra-patch-src_nvidia__subr.c
>===================================================================
>--- x11/nvidia-driver/files/extra-patch-src_nvidia__subr.c	(nonexistent)
>+++ x11/nvidia-driver/files/extra-patch-src_nvidia__subr.c	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/nvidia_subr.c.orig	2018-06-04 04:06:10 UTC
>++++ src/nvidia_subr.c
>+@@ -382,7 +382,7 @@ int nvidia_get_card_info(void *args, int size)
>+     }
>+ 
>+     ci = args;
>+-    memset(ci, 0, sizeof(ci));
>++    memset(ci, 0, sizeof(*ci));
>+ 
>+     for (i = 0; i < NV_MAX_DEVICES; i++) {
>+         sc = devclass_get_softc(nvidia_devclass, i);
>
>Property changes on: x11/nvidia-driver/files/extra-patch-src_nvidia__subr.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: x11/nvidia-driver/files/extra-patch-src_nvidia_nvidia__subr.c
>===================================================================
>--- x11/nvidia-driver/files/extra-patch-src_nvidia_nvidia__subr.c	(nonexistent)
>+++ x11/nvidia-driver/files/extra-patch-src_nvidia_nvidia__subr.c	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/nvidia/nvidia_subr.c.orig	2018-06-04 03:59:57 UTC
>++++ src/nvidia/nvidia_subr.c
>+@@ -364,7 +364,7 @@ int nvidia_get_card_info(void *args, int size)
>+     }
>+ 
>+     ci = args;
>+-    memset(ci, 0, sizeof(ci));
>++    memset(ci, 0, sizeof(*ci));
>+ 
>+     for (i = 0; i < NV_MAX_DEVICES; i++) {
>+         sc = devclass_get_softc(nvidia_devclass, i);
>
>Property changes on: x11/nvidia-driver/files/extra-patch-src_nvidia_nvidia__subr.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Flags:

woodsb02: maintainer-approval? (danfe)

Actions: View | Diff

Attachments on bug 228709: 193982