diff options
Diffstat (limited to 'meta-amdfalconx86/recipes-kernel/linux/files/0248-drm-amdgpu-use-WARN_ON_ONCE-instead-of-BUG_ON-in-the.patch')
| -rw-r--r-- | meta-amdfalconx86/recipes-kernel/linux/files/0248-drm-amdgpu-use-WARN_ON_ONCE-instead-of-BUG_ON-in-the.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/meta-amdfalconx86/recipes-kernel/linux/files/0248-drm-amdgpu-use-WARN_ON_ONCE-instead-of-BUG_ON-in-the.patch b/meta-amdfalconx86/recipes-kernel/linux/files/0248-drm-amdgpu-use-WARN_ON_ONCE-instead-of-BUG_ON-in-the.patch new file mode 100644 index 00000000..8b28977e --- /dev/null +++ b/meta-amdfalconx86/recipes-kernel/linux/files/0248-drm-amdgpu-use-WARN_ON_ONCE-instead-of-BUG_ON-in-the.patch @@ -0,0 +1,40 @@ +From 364fe90c8a3964ec2d7bc9f61eca4f9780cc71ce Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com> +Date: Mon, 25 Jan 2016 13:01:42 +0100 +Subject: [PATCH 0248/1110] drm/amdgpu: use WARN_ON_ONCE instead of BUG_ON in + the SA +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Crashing the system doesn't helps at all. Also properly return +-EINVAL if size or alignment are outside valid ranges. + +Signed-off-by: Christian König <christian.koenig@amd.com> +Reviewed-by: Alex Deucher <alexander.deucher@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c +index ca72a2e..2faf03b 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c +@@ -321,8 +321,11 @@ int amdgpu_sa_bo_new(struct amdgpu_sa_manager *sa_manager, + int i, r; + signed long t; + +- BUG_ON(align > sa_manager->align); +- BUG_ON(size > sa_manager->size); ++ if (WARN_ON_ONCE(align > sa_manager->align)) ++ return -EINVAL; ++ ++ if (WARN_ON_ONCE(size > sa_manager->size)) ++ return -EINVAL; + + *sa_bo = kmalloc(sizeof(struct amdgpu_sa_bo), GFP_KERNEL); + if ((*sa_bo) == NULL) { +-- +2.7.4 + |