jer 14/12/01 12:47:46
Added: nvidia-drivers-346.16-pax-usercopy.patch
nvidia-drivers-346.16-pax-constify.patch
Log:
Add new PaX patches (bug #529633).
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key
A792A613)
Revision Changes Path
1.1
x11-drivers/nvidia-drivers/files/nvidia-drivers-346.16-pax-usercopy.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia-drivers/files/nvidia-drivers-346.16-pax-usercopy.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia-drivers/files/nvidia-drivers-346.16-pax-usercopy.patch?rev=1.1&content-type=text/plain
Index: nvidia-drivers-346.16-pax-usercopy.patch
===================================================================
--- a/kernel/nv.c
+++ b/kernel/nv.c
@@ -705,7 +705,7 @@ int __init nvidia_init_module(void)
#endif
nvidia_stack_t_cache = NV_KMEM_CACHE_CREATE(nvidia_stack_cache_name,
- nvidia_stack_t);
+ nvidia_stack_t, SLAB_USERCOPY);
if (nvidia_stack_t_cache == NULL)
{
nv_printf(NV_DBG_ERRORS, "NVRM: stack cache allocation failed!\n");
@@ -846,7 +846,7 @@ int __init nvidia_init_module(void)
nv_lock_init_locks(nv);
nvidia_pte_t_cache = NV_KMEM_CACHE_CREATE(nvidia_pte_cache_name,
- nvidia_pte_t);
+ nvidia_pte_t, 0);
if (nvidia_pte_t_cache == NULL)
{
rc = -ENOMEM;
@@ -857,7 +857,7 @@ int __init nvidia_init_module(void)
if (!nv_multiple_kernel_modules)
{
nvidia_p2p_page_t_cache =
NV_KMEM_CACHE_CREATE(nvidia_p2p_page_cache_name,
- nvidia_p2p_page_t);
+ nvidia_p2p_page_t, 0);
if (nvidia_p2p_page_t_cache == NULL)
{
rc = -ENOMEM;
--- a/kernel/nv-linux.h
+++ b/kernel/nv-linux.h
@@ -1431,11 +1431,11 @@ extern void *nvidia_stack_t_cache;
#if !defined(NV_VMWARE)
#if (NV_KMEM_CACHE_CREATE_ARGUMENT_COUNT == 5)
-#define NV_KMEM_CACHE_CREATE(name, type) \
- kmem_cache_create(name, sizeof(type), 0, 0, NULL)
+#define NV_KMEM_CACHE_CREATE(name, type, flags) \
+ kmem_cache_create(name, sizeof(type), 0, flags, NULL)
#else
-#define NV_KMEM_CACHE_CREATE(name, type) \
- kmem_cache_create(name, sizeof(type), 0, 0, NULL, \
+#define NV_KMEM_CACHE_CREATE(name, type, flags) \
+ kmem_cache_create(name, sizeof(type), 0, flags, NULL, \
NULL)
#endif
#define NV_KMEM_CACHE_DESTROY(kmem_cache) \
1.1
x11-drivers/nvidia-drivers/files/nvidia-drivers-346.16-pax-constify.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia-drivers/files/nvidia-drivers-346.16-pax-constify.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia-drivers/files/nvidia-drivers-346.16-pax-constify.patch?rev=1.1&content-type=text/plain
Index: nvidia-drivers-346.16-pax-constify.patch
===================================================================
--- a/kernel/uvm/uvm_common.c
+++ b/kernel/uvm/uvm_common.c
@@ -95,7 +95,6 @@ static RM_STATUS uvmnext_gpu_event_stop_
#endif // NVIDIA_UVM_NEXT_ENABLED
static dev_t g_uvmBaseDev;
-struct UvmOpsUvmEvents g_exportedUvmOps;
// TODO: This would be easier if RM allowed for multiple registrations, since
we
// could register UVM-Lite and UVM-Next separately (bug 1372835).
@@ -147,9 +146,11 @@ static RM_STATUS uvmSetupGpuProvider(voi
RM_STATUS status = RM_OK;
#ifdef NVIDIA_UVM_RM_ENABLED
- g_exportedUvmOps.startDevice = uvm_gpu_event_start_device;
- g_exportedUvmOps.stopDevice = uvm_gpu_event_stop_device;
- g_exportedUvmOps.isrTopHalf = uvmnext_isr_top_half;
+ static struct UvmOpsUvmEvents g_exportedUvmOps = {
+ .startDevice = uvm_gpu_event_start_device,
+ .stopDevice = uvm_gpu_event_stop_device,
+ .isrTopHalf = uvmnext_isr_top_half,
+ };
// call RM to exchange the function pointers.
status = nvUvmInterfaceRegisterUvmCallbacks(&g_exportedUvmOps);
