Re: 2.6.8.1-mm4

[ebiederm@xmission.com (Eric W. Biederman)]

Andrew Morton <akpm@osdl.org> writes:

> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.8.1/2.6.8.1-mm4/
> 
> 
> - Added the kexec code.  Again.  This was in -mm a year or so ago but didn't
>   make it.

Hopefully it will this round :)

There is a null pointer dereference bug in ide_print_status,
the following patch allows me to boot.

The function still looks fishy as there is another access
to rq outside of ide_lock, a few lines earlier.

Eric

diff -uNrX linux-exclude-files linux-2.6.8.1-mm4-i8259-shutdown-x86_64/drivers/ide/ide.c linux-2.6.8.1-mm4-i8259-x86_64/drivers/ide/ide.c
--- linux-2.6.8.1-mm4-i8259-shutdown-x86_64/drivers/ide/ide.c	Sun Aug 22 21:15:25 2004
+++ linux-2.6.8.1-mm4-i8259-x86_64/drivers/ide/ide.c	Sun Aug 22 22:07:54 2004
@@ -442,7 +442,10 @@
 		int opcode = 0x100;
 
 		spin_lock(&ide_lock);
-		rq = HWGROUP(drive)->rq;
+		rq = 0;
+		if (HWGROUP(drive)) {
+			rq = HWGROUP(drive)->rq;
+		}
 		spin_unlock(&ide_lock);
 		if (!rq)
 			goto out;