drm: Branch 'master'

 amdgpu/amdgpu_gpu_info.c |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 6493860d70b4b1bc4b7327dbb8b951643413a0ae
Author: Alex Deucher <[email protected]>
Date:   Fri Oct 28 16:56:13 2016 -0400

    amdgpu: check parameters in amdgpu_query_gpu_info
    
    Make sure they aren't NULL.
    
    Bug: https://bugs.freedesktop.org/show_bug.cgi?id=97993
    
    Reviewed-by: Christian König <[email protected]>
    Signed-off-by: Alex Deucher <[email protected]>

diff --git a/amdgpu/amdgpu_gpu_info.c b/amdgpu/amdgpu_gpu_info.c
index 0f23297..66c7e0e 100644
--- a/amdgpu/amdgpu_gpu_info.c
+++ b/amdgpu/amdgpu_gpu_info.c
@@ -230,6 +230,8 @@ drm_private int amdgpu_query_gpu_info_init(amdgpu_device_handle dev)
 int amdgpu_query_gpu_info(amdgpu_device_handle dev,
 			struct amdgpu_gpu_info *info)
 {
+	if ((dev == NULL) || (info == NULL))
+		return -EINVAL;
 	/* Get ASIC info*/
 	*info = dev->info;

------------------------------------------------------------------------------
Developer Access Program for Intel Xeon Phi Processors
Access to Intel Xeon Phi processor-based developer platforms.
With one year of Intel Parallel Studio XE.
Training and support from Colfax.
Order your platform today. http://sdm.link/xeonphi

--
_______________________________________________
Dri-patches mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/dri-patches