Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ea180f1 authored by Peilin Ye's avatar Peilin Ye Committed by Greg Kroah-Hartman
Browse files

drm/amdgpu: Prevent kernel-infoleak in amdgpu_info_ioctl() 



commit 543e8669ed9bfb30545fd52bc0e047ca4df7fb31 upstream.

Compiler leaves a 4-byte hole near the end of `dev_info`, causing
amdgpu_info_ioctl() to copy uninitialized kernel stack memory to userspace
when `size` is greater than 356.

In 2015 we tried to fix this issue by doing `= {};` on `dev_info`, which
unfortunately does not initialize that 4-byte hole. Fix it by using
memset() instead.

Cc: stable@vger.kernel.org
Fixes: c193fa91 ("drm/amdgpu: information leak in amdgpu_info_ioctl()")
Fixes: d38ceaf9 ("drm/amdgpu: add core driver (v4)")
Suggested-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarPeilin Ye <yepeilin.cs@gmail.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f1b4bdde

drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c

+2 −1
Original line number Diff line number Diff line
@@ -667,9 +667,10 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file 
		return n ? -EFAULT : 0;

	}

	case AMDGPU_INFO_DEV_INFO: {

		struct drm_amdgpu_info_device dev_info = {};

		struct drm_amdgpu_info_device dev_info;

		uint64_t vm_size;



		memset(&dev_info, 0, sizeof(dev_info));

		dev_info.device_id = dev->pdev->device;

		dev_info.chip_rev = adev->rev_id;

		dev_info.external_rev = adev->external_rev_id;