rpms/kernel/F-13 kernel.spec, 1.1959, 1.1960 ssb_check_for_sprom.patch, 1.1, 1.2

[John W. Linville]

Author: linville

Update of /cvs/pkgs/rpms/kernel/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv12719

Modified Files:
	kernel.spec ssb_check_for_sprom.patch 
Log Message:
Avoid null pointer dereference introduced by 'ssb: check for sprom' (#577463)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-13/kernel.spec,v
retrieving revision 1.1959
retrieving revision 1.1960
diff -u -p -r1.1959 -r1.1960
--- kernel.spec	29 Mar 2010 20:40:27 -0000	1.1959
+++ kernel.spec	30 Mar 2010 18:01:48 -0000	1.1960
@@ -2015,6 +2015,9 @@ fi
 # and build.
 
 %changelog
+* Tue Mar 30 2010 John W. Linville <linville at redhat.com> 2.6.33.1-24
+- Avoid null pointer dereference introduced by 'ssb: check for sprom' (#577463)
+
 * Mon Mar 29 2010 John W. Linville <linville at redhat.com> 2.6.33.1-23
 - iwlwifi: reset card during probe (#557084)
 - iwlwifi: use dma_alloc_coherent (#574146)

ssb_check_for_sprom.patch:
 b/drivers/ssb/driver_chipcommon.c           |    3 +++
 b/drivers/ssb/pci.c                         |    3 +++
 b/drivers/ssb/sprom.c                       |   22 ++++++++++++++++++++++
 b/include/linux/ssb/ssb.h                   |    3 +++
 b/include/linux/ssb/ssb_driver_chipcommon.h |   16 +++++++++++++++-
 drivers/ssb/sprom.c                         |    5 ++++-
 6 files changed, 50 insertions(+), 2 deletions(-)

Index: ssb_check_for_sprom.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-13/ssb_check_for_sprom.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ssb_check_for_sprom.patch	20 Mar 2010 01:04:13 -0000	1.1
+++ ssb_check_for_sprom.patch	30 Mar 2010 18:01:49 -0000	1.2
@@ -153,3 +153,33 @@ index 4e27acf..2cdf249 100644
 -- 
 1.6.2.5
 
+From ec032742062ad1b01dfe75cfccdbc5b850837c23 Mon Sep 17 00:00:00 2001
+From: John W. Linville <linville at tuxdriver.com>
+Date: Tue, 30 Mar 2010 13:47:39 -0400
+Subject: [PATCH] ssb: avoid null ptr deref in ssb_is_sprom_available
+
+Some older devices don't have chipcommon, but they do have SPROM.
+
+Signed-off-by: John W. Linville <linville at tuxdriver.com>
+---
+ drivers/ssb/sprom.c |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/ssb/sprom.c b/drivers/ssb/sprom.c
+index 55eb9b0..874d8f1 100644
+--- a/drivers/ssb/sprom.c
++++ b/drivers/ssb/sprom.c
+@@ -178,6 +178,10 @@ const struct ssb_sprom *ssb_get_fallback_sprom(void)
+ 
+ bool ssb_is_sprom_available(struct ssb_bus *bus)
+ {
++	/* some older devices don't have chipcommon, but they have sprom */
++	if (!bus->chipco.dev)
++		return true;
++
+ 	/* status register only exists on chipcomon rev >= 11 */
+ 	if (bus->chipco.dev->id.revision < 11)
+ 		return true;
+-- 
+1.6.2.5
+