rpms/libdrm/F-12 nouveau-fix-bo-failure.patch, NONE, 1.1 libdrm.spec, 1.98, 1.99

[Ben Skeggs]

Author: bskeggs

Update of /cvs/pkgs/rpms/libdrm/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv20534

Modified Files:
	libdrm.spec 
Added Files:
	nouveau-fix-bo-failure.patch 
Log Message:
* Sat Apr 10 2010 Ben Skeggs <bskeggs at redhat.com> 2.4.18-2
- nouveau: fix nouveau_bo_new() failure paths to do the right thing



nouveau-fix-bo-failure.patch:
 nouveau_bo.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE nouveau-fix-bo-failure.patch ---
>From df32c307e8f81b46ee8aa4dd7222fc18f175bbb3 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs at redhat.com>
Date: Fri, 19 Mar 2010 10:17:19 +1000
Subject: [PATCH] nouveau: fix segfault in nouveau_bo_new_tile() failure path

---
 nouveau/nouveau_bo.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/nouveau/nouveau_bo.c b/nouveau/nouveau_bo.c
index 4973636..32b23b6 100644
--- a/nouveau/nouveau_bo.c
+++ b/nouveau/nouveau_bo.c
@@ -198,15 +198,15 @@ nouveau_bo_new_tile(struct nouveau_device *dev, uint32_t flags, int align,
 	if (flags & (NOUVEAU_BO_VRAM | NOUVEAU_BO_GART)) {
 		ret = nouveau_bo_kalloc(nvbo, NULL);
 		if (ret) {
-			nouveau_bo_ref(NULL, (void *)nvbo);
+			nouveau_bo_ref(NULL, (void *)&nvbo);
 			return ret;
 		}

		if (flags & NOUVEAU_BO_PIN) {
			ret = nouveau_bo_pin((void *)nvbo, nvbo->flags);
			if (ret) {
-				nouveau_bo_ref(NULL, (void *)nvbo);
+				nouveau_bo_ref(NULL, (void *)&nvbo);
				return ret;
			}
		}
 	}
-- 
1.7.0.1



Index: libdrm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/F-12/libdrm.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- libdrm.spec	19 Feb 2010 03:21:44 -0000	1.98
+++ libdrm.spec	10 Apr 2010 00:35:20 -0000	1.99
@@ -3,7 +3,7 @@
 Summary: Direct Rendering Manager runtime library
 Name: libdrm
 Version: 2.4.18
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://dri.sourceforge.net
@@ -28,6 +28,7 @@ Patch3: libdrm-make-dri-perms-okay.patch
 Patch4: libdrm-2.4.0-no-bc.patch
 # revert nouveau to interface available in F12 kernel
 Patch5: nouveau-revert-to-0.0.15.patch
+Patch6: nouveau-fix-bo-failure.patch
 
 
 %description
@@ -49,6 +50,7 @@ Direct Rendering Manager development pac
 %patch3 -p1 -b .forceperms
 %patch4 -p1 -b .no-bc
 %patch5 -p1 -b .nouveau-revert
+%patch6 -p1 -b .nouveau-bofix
 
 %build
 autoreconf -v --install || exit 1
@@ -108,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libdrm_nouveau.pc
 
 %changelog
+* Sat Apr 10 2010 Ben Skeggs <bskeggs at redhat.com> 2.4.18-2
+- nouveau: fix nouveau_bo_new() failure paths to do the right thing
+
 * Fri Feb 19 2010 Ben Skeggs <bskeggs at redhat.com> 2.4.18-1
 - upstream released 2.4.18