nvkms: Support NULL padding

Signed-off-by: Yusuf Khan<[email protected]>
NVIDIA · Jun 3, 2022 · 5e7f740 · 5e7f740
1 parent 952f7a0
commit 5e7f740
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/kernel-open/nvidia-drm/nvidia-drm-gem-dma-buf.c b/kernel-open/nvidia-drm/nvidia-drm-gem-dma-buf.c
@@ -155,7 +155,7 @@ int nv_drm_gem_export_dmabuf_memory_ioctl(struct drm_device *dev,
         goto done;
     }
 
-    if (p->__pad != 0) {
+    if (p->__pad != 0 | p->__pad != NULL) {
         ret = -EINVAL;
         NV_DRM_DEV_LOG_ERR(nv_dev, "Padding fields must be zeroed");
         goto done;

diff --git a/kernel-open/nvidia-drm/nvidia-drm-gem-nvkms-memory.c b/kernel-open/nvidia-drm/nvidia-drm-gem-nvkms-memory.c
@@ -396,7 +396,7 @@ int nv_drm_gem_export_nvkms_memory_ioctl(struct drm_device *dev,
         goto done;
     }
 
-    if (p->__pad != 0) {
+    if (p->__pad != 0 | p->__pad != NULL) {
         ret = -EINVAL;
         NV_DRM_DEV_LOG_ERR(nv_dev, "Padding fields must be zeroed");
         goto done;
@@ -448,7 +448,7 @@ int nv_drm_gem_alloc_nvkms_memory_ioctl(struct drm_device *dev,
         goto failed;
     }
 
-    if (p->__pad != 0) {
+    if (p->__pad != 0 | p->__pad != NULL) {
         ret = -EINVAL;
         NV_DRM_DEV_LOG_ERR(nv_dev, "non-zero value in padding field");
         goto failed;