rpms/psb-kmod/F-14 0001-Attempt-to-deal-with-psb_dispatch_raster-NULL-derefe.patch, NONE, 1.1 psb-kmod.spec, 1.15, 1.16

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/nonfree/rpms/psb-kmod/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26532

Modified Files:
	psb-kmod.spec 
Added Files:
	0001-Attempt-to-deal-with-psb_dispatch_raster-NULL-derefe.patch 
Log Message:
- Add patch from Lubomir Rintel - rfbz#1676


0001-Attempt-to-deal-with-psb_dispatch_raster-NULL-derefe.patch:
 psb_schedule.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE 0001-Attempt-to-deal-with-psb_dispatch_raster-NULL-derefe.patch ---
>From 8bd7c585fc7b8636187843a0f55f00c2eb0cc826 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Sun, 13 Mar 2011 15:41:41 +0100
Subject: [PATCH] Attempt to deal with psb_dispatch_raster() NULL dereferences:

[10799.942597] BUG: unable to handle kernel at 0000023c
[10799.942597] IP: [<f861a137>] psb_dispatch_raster+0x19/0x205 [psb]
[11046.173915] *pde = 22875067 *pte = 00000000
[11046.173915] Oops: 0000 [#1]
---
 psb_schedule.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/psb_schedule.c b/psb_schedule.c
index 959f8f9..572fdc6 100644
--- a/psb_schedule.c
+++ b/psb_schedule.c
@@ -824,6 +824,11 @@ static void psb_dispatch_raster(struct drm_psb_private *dev_priv,
 	uint32_t flags;
 	uint32_t mask;
 
+	if (!task) {
+		DRM_ERROR("Null task passed to psb_dispatch_raster().\n");
+		return;
+	}
+
 	task->reply_flags |= reply_flag;
 	flags = task->reply_flags;
 	mask = PSB_RF_FIRE_RASTER;
-- 
1.7.1



Index: psb-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/psb-kmod/F-14/psb-kmod.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- psb-kmod.spec	28 May 2011 05:39:40 -0000	1.15
+++ psb-kmod.spec	10 Jul 2011 17:40:48 -0000	1.16
@@ -3,11 +3,11 @@
 # "buildforkernels newest" macro for just that build; immediately after
 # queuing that build enable the macro again for subsequent builds; that way
 # a new akmod package will only get build when a new one is actually needed
-%define buildforkernels newest
+#define buildforkernels newest
 
 Name:		psb-kmod
 Version:	4.41.1
-Release:	14%{?dist}.12
+Release:	15%{?dist}
 Summary:	Kernel module for Poulsbo graphics chipsets
 
 Group:		System Environment/Kernel
@@ -44,6 +44,7 @@
 Patch10:	0003-psb-Fix-framebuffer.patch
 # From Lubomir Rintel: fix build for 2.6.35
 Patch11:	psb-kmod-4.41.1-overflow.patch
+Patch12:	0001-Attempt-to-deal-with-psb_dispatch_raster-NULL-derefe.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExclusiveArch:	i586 i686
 
@@ -86,6 +87,7 @@
 %patch9 -p1 -b .debug
 %patch10 -p1 -b .framebuffer
 %patch11 -p1 -b .overflow
+%patch12 -p1 -b .nullderef
  popd
 done
 
@@ -116,6 +118,9 @@
 
 
 %changelog
+* Sun Jul 10 2011 Nicolas Chauvet <kwizart at gmail.com> - 4.41.1-15
+- Add patch from Lubomir Rintel - rfbz#1676
+
 * Sat May 28 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 4.41.1-14.12
 - rebuild for updated kernel