Return-Path: <linux-kernel-owner+willy=40w.ods.org@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id <S261310AbTCYBDM>; Mon, 24 Mar 2003 20:03:12 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org
	id <S261308AbTCYBDM>; Mon, 24 Mar 2003 20:03:12 -0500
Received: from air-2.osdl.org ([65.172.181.6]:17335 "EHLO mail.osdl.org")
	by vger.kernel.org with ESMTP id <S261307AbTCYBDK>;
	Mon, 24 Mar 2003 20:03:10 -0500
Subject: [PATCH 2.5.66] md/linear oops fix
From: Daniel McNeil <daniel@osdl.org>
To: Linus Torvalds <torvalds@transmeta.com>
Cc: NeilBrown <neilb@cse.unsw.edu.au>, linux-raid <linux-raid@vger.kernel.org>,
       Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
       Ingo Molnar <mingo@redhat.com>
Content-Type: multipart/mixed; boundary="=-rPoZXeS65NOp4GXSO0ZG"
Organization: 
Message-Id: <1048554851.31398.7.camel@ibm-c.pdx.osdl.net>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.2.1 
Date: 24 Mar 2003 17:14:11 -0800
Sender: linux-kernel-owner@vger.kernel.org
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 1419
Lines: 42


--=-rPoZXeS65NOp4GXSO0ZG
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

This fixes an oops caused by incorrect usage of sector_div()
in which_dev() in md/linear.c.  It was dereferencing an non-existent
hash table entry.


-- 
Daniel McNeil <daniel@osdl.org>

--=-rPoZXeS65NOp4GXSO0ZG
Content-Disposition: attachment; filename=patch-2.5.66-linear
Content-Type: text/x-patch; name=patch-2.5.66-linear; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit

diff -urNp -X /home/daniel/dontdiff linux-2.5.66/drivers/md/linear.c linux-2.5.66-md/drivers/md/linear.c
--- linux-2.5.66/drivers/md/linear.c	Mon Mar 24 14:00:20 2003
+++ linux-2.5.66-md/drivers/md/linear.c	Mon Mar 24 16:53:50 2003
@@ -37,7 +37,11 @@ static inline dev_info_t *which_dev(mdde
 	linear_conf_t *conf = mddev_to_conf(mddev);
 	sector_t block = sector >> 1;
 
-	hash = conf->hash_table + sector_div(block, conf->smallest->size);
+	/*
+	 * sector_div(a,b) returns the remainer and sets a to a/b
+	 */
+	(void)sector_div(block, conf->smallest->size);
+	hash = conf->hash_table + block;
 
 	if ((sector>>1) >= (hash->dev0->size + hash->dev0->offset))
 		return hash->dev1;

--=-rPoZXeS65NOp4GXSO0ZG--

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/