linux-kernel - Re: DRM/ttm: Unreachable code in ttm_bo_add

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <alpine.DEB.2.00.0912072328050.14943@skynet.skynet.ie>
Date:	Mon, 7 Dec 2009 23:28:38 +0000 (GMT)
From:	Dave Airlie <airlied@...ux.ie>
To:	Jiri Slaby <jirislaby@...il.com>
cc:	Thomas Hellstrom <thellstrom@...are.com>,
	Dave Airlie <airlied@...hat.com>,
	dri-devel@...ts.sourceforge.net,
	LKML <linux-kernel@...r.kernel.org>
Subject: Re: DRM/ttm: Unreachable code in ttm_bo_add_ttm

On Mon, 7 Dec 2009, Jiri Slaby wrote:

> Hi,
> 
> Stanse found unreachable code in ttm_bo_add_ttm:
> http://decibel.fi.muni.cz/~xslaby/stanse/error.cgi?db=32&id=714#l238
> 
> Excerpt from there:
>   230| case ttm_bo_type_user:
>   231|  bo->ttm = ttm_tt_create(bdev, bo->num_pages << 12,
>   232|     page_flags | (1 << 1),
>   233|     glob->dummy_read_page);
>   234|  if (bo->ttm == ((void *)0))
>   235|   ret = -12;
>   236|  break;
>   237|
>   238|  ret = ttm_tt_set_user(bo->ttm, get_current(),
>      |This node is unreachable prev next
>   239|          bo->buffer_start, bo->num_pages);
>   240|  if (ret != 0)
>   241|   ttm_tt_destroy(bo->ttm);
>   242|  break;
> 
> 

Thanks,
I've pushed this patch.

>From 447aeb907e417e0e837b4a4026d5081c88b6e8ca Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@...hat.com>
Date: Tue, 8 Dec 2009 09:25:45 +1000
Subject: [PATCH] drm/ttm: fix unreachable code.

None of the in-tree drivers use user objects yet so this wasn't hitting
us.

Stanse found unreachable code in ttm_bo_add_ttm:
http://decibel.fi.muni.cz/~xslaby/stanse/error.cgi?db=32&id=714#l238

Reported-by: Jiri Slaby <jirislaby@...il.com>
Signed-off-by: Dave Airlie <airlied@...hat.com>
---
 drivers/gpu/drm/ttm/ttm_bo.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index 87c0625..e13fd23 100644
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -275,9 +275,10 @@ static int ttm_bo_add_ttm(struct ttm_buffer_object *bo, bool zero_alloc)
 		bo->ttm = ttm_tt_create(bdev, bo->num_pages << PAGE_SHIFT,
 					page_flags | TTM_PAGE_FLAG_USER,
 					glob->dummy_read_page);
-		if (unlikely(bo->ttm == NULL))
+		if (unlikely(bo->ttm == NULL)) {
 			ret = -ENOMEM;
-		break;
+			break;
+		}
 
 		ret = ttm_tt_set_user(bo->ttm, current,
 				      bo->buffer_start, bo->num_pages);
-- 
1.6.5.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/