From: Chris Wright <chrisw@osdl.org>
Date: Thu, 1 Sep 2005 23:39:48 +0000 (-0700)
Subject: Add aacraid fix from Mark Haverkamp, fwd from akpm.
X-Git-Tag: v2.6.13.1~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1e8fba4fbff1426a1776caa88c298f845890a5c8;p=thirdparty%2Fkernel%2Fstable-queue.git

Add aacraid fix from Mark Haverkamp, fwd from akpm.
---

diff --git a/queue/aacraid-bad-BUG_ON-fix.patch b/queue/aacraid-bad-BUG_ON-fix.patch
new file mode 100644
index 00000000000..1008a3625e2
--- /dev/null
+++ b/queue/aacraid-bad-BUG_ON-fix.patch
@@ -0,0 +1,33 @@
+From linux-kernel-owner+chrisw=40osdl.org-S1030193AbVIAPWg@vger.kernel.org  Thu Sep  1 08:23:18 2005
+Subject: [PATCH] aacraid:  2.6.13 aacraid bad BUG_ON fix
+From: Mark Haverkamp <markh@osdl.org>
+To: James Bottomley <James.Bottomley@steeleye.com>,
+        Andrew Morton <akpm@osdl.org>
+Cc: linux-scsi <linux-scsi@vger.kernel.org>,
+        linux-kernel <linux-kernel@vger.kernel.org>,
+        Mark Salyzyn <mark_salyzyn@adaptec.com>
+Date: 	Thu, 01 Sep 2005 08:19:23 -0700
+
+This was noticed by Doug Bazamic and the fix found by Mark Salyzyn at
+Adaptec.
+
+There was an error in the BUG_ON() statement that validated the
+calculated fib size which can cause the driver to panic.
+
+Signed-off-by: Mark Haverkamp <markh@osdl.org>
+Acked-by: James Bottomley <James.Bottomley@SteelEye.com>
+Signed-off-by: Chris Wright <chrisw@osdl.org>
+---
+
+--- a/drivers/scsi/aacraid/aachba.c	2005-08-28 19:41:01.000000000 -0400
++++ b/drivers/scsi/aacraid/aachba.c	2005-09-01 08:05:29.118304656 -0400
+@@ -968,7 +968,7 @@
+ 		fibsize = sizeof(struct aac_read64) + 
+ 			((le32_to_cpu(readcmd->sg.count) - 1) * 
+ 			 sizeof (struct sgentry64));
+-		BUG_ON (fibsize > (sizeof(struct hw_fib) - 
++		BUG_ON (fibsize > (dev->max_fib_size - 
+ 					sizeof(struct aac_fibhdr)));
+ 		/*
+ 		 *	Now send the Fib to the adapter
+
diff --git a/queue/series b/queue/series
index 8ff18e1bd43..25b333c66a2 100644
--- a/queue/series
+++ b/queue/series
@@ -1 +1,2 @@
 saa7134-dvb-must-select-tda1004x.patch
+aacraid-bad-BUG_ON-fix.patch