LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Greg KH <greg@kroah.com>
To: linux-kernel@vger.kernel.org, stable@kernel.org
Cc: Justin Forbes <jmforbes@linuxtx.org>,
	Zwane Mwaikambo <zwane@arm.linux.org.uk>,
	"Theodore Ts'o" <tytso@mit.edu>,
	Randy Dunlap <rdunlap@xenotime.net>,
	Dave Jones <davej@redhat.com>,
	Chuck Wolber <chuckw@quantumlinux.com>,
	Chris Wedgwood <reviews@ml.cw.f00f.org>,
	Michael Krufky <mkrufky@linuxtv.org>,
	torvalds@linux-foundation.org, akpm@linux-foundation.org,
	alan@lxorguk.ukuu.org.uk, sandeen@redhat.com,
	Andrew Morton <akpm@osdl.org>, Linus Torvalds <torvalds@osdl.org>,
	Chris Wright <chrisw@sous-sol.org>
Subject: [patch 07/18] grow_buffers() infinite loop fix (CVE-2006-5757, CVE-2006-6060)
Date: Tue, 20 Feb 2007 17:50:21 -0800	[thread overview]
Message-ID: <20070221015021.GH3684@kroah.com> (raw)
In-Reply-To: <20070221014927.GA3684@kroah.com>

[-- Attachment #1: grow_buffers-infinite-loop-fix.patch --]
[-- Type: text/plain, Size: 1986 bytes --]

-stable review patch.  If anyone has any objections, please let us know.

------------------
From: Andrew Morton <akpm@osdl.org>

If grow_buffers() is for some reason passed a block number which wants to lie
outside the maximum-addressable pagecache range (PAGE_SIZE * 4G bytes) then it
will accidentally truncate `index' and will then instnatiate a page at the
wrong pagecache offset.  This causes __getblk_slow() to go into an infinite
loop.

This can happen with corrupted disks, or with software errors elsewhere.

Detect that, and handle it.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
 fs/buffer.c |   21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

--- linux-2.6.18.7.orig/fs/buffer.c
+++ linux-2.6.18.7/fs/buffer.c
@@ -1179,8 +1179,21 @@ grow_buffers(struct block_device *bdev, 
 	} while ((size << sizebits) < PAGE_SIZE);
 
 	index = block >> sizebits;
-	block = index << sizebits;
 
+	/*
+	 * Check for a block which wants to lie outside our maximum possible
+	 * pagecache index.  (this comparison is done using sector_t types).
+	 */
+	if (unlikely(index != block >> sizebits)) {
+		char b[BDEVNAME_SIZE];
+
+		printk(KERN_ERR "%s: requested out-of-range block %llu for "
+			"device %s\n",
+			__FUNCTION__, (unsigned long long)block,
+			bdevname(bdev, b));
+		return -EIO;
+	}
+	block = index << sizebits;
 	/* Create a page with the proper size buffers.. */
 	page = grow_dev_page(bdev, block, index, size);
 	if (!page)
@@ -1207,12 +1220,16 @@ __getblk_slow(struct block_device *bdev,
 
 	for (;;) {
 		struct buffer_head * bh;
+		int ret;
 
 		bh = __find_get_block(bdev, block, size);
 		if (bh)
 			return bh;
 
-		if (!grow_buffers(bdev, block, size))
+		ret = grow_buffers(bdev, block, size);
+		if (ret < 0)
+			return NULL;
+		if (ret == 0)
 			free_more_memory();
 	}
 }

--

  parent reply	other threads:[~2007-02-21  1:57 UTC|newest]

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20070221014413.282048309@mini.kroah.org>
2007-02-21  1:49 ` [patch 00/18] 2.6.18-stable review Greg KH
2007-02-21  1:49   ` [patch 01/18] bcm43xx: Fix for oops on resume Greg KH
2007-02-23  5:25     ` Pavel Machek
2007-02-25  2:30       ` Larry Finger
2007-02-25  8:53         ` Andrew Morton
2007-02-21  1:49   ` [patch 02/18] bcm43xx: Fix for oops on ampdu status Greg KH
2007-02-21  1:49   ` [patch 03/18] Dont leak NT bit into next task Greg KH
2007-02-21 10:00     ` Giuseppe Bilotta
2007-02-21 17:14       ` Jan Engelhardt
2007-02-21 17:20       ` Chuck Ebbert
2007-02-22 15:29       ` Adrian Bunk
2007-02-22 16:56         ` Andi Kleen
2007-02-21  1:50   ` [patch 04/18] SCSI: add missing cdb clearing in scsi_execute() Greg KH
2007-02-21  1:50   ` [patch 05/18] IB/srp: Fix FMR mapping for 32-bit kernels and addresses above 4G Greg KH
2007-02-21  1:50   ` [patch 06/18] i2c: fix broken ds1337 initialization Greg KH
2007-02-21  1:50   ` Greg KH [this message]
2007-02-21  1:50   ` [patch 08/18] hfs_fill_super returns success even if no root inode (CVE-2006-6056) Greg KH
2007-02-21  1:50   ` [patch 09/18] IB/mad: Fix race between cancel and receive completion Greg KH
2007-02-21  1:50   ` [patch 10/18] dvb-core: fix bug in CRC-32 checking on 64-bit systems Greg KH
2007-02-21  1:50   ` [patch 11/18] v4l: cx2341x audio_properties is an u16, not u8 Greg KH
2007-02-21  1:50   ` [patch 12/18] v4l: cx88: Fix leadtek_eeprom tagging Greg KH
2007-02-21  1:51   ` [patch 13/18] V4L: cx88: Fix lockup on suspend Greg KH
2007-02-22  1:14     ` Michael Krufky
2007-02-23 23:50       ` Greg KH
2007-02-21  1:51   ` [patch 14/18] V4L: Fix quickcam communicator driver for big endian architectures Greg KH
2007-02-21  1:51   ` [patch 15/18] V4L: fix ks0127 status flags Greg KH
2007-02-21  1:51   ` [patch 16/18] V4L: tveeprom: autodetect LG TAPC G701D as tuner type 37 Greg KH
2007-02-21  1:51   ` [patch 17/18] V4L: buf_qbuf: fix videobuf_queue->stream corruption and lockup Greg KH
2007-02-21  1:51   ` [patch 18/18] x86_64: fix 2.6.18 regression - PTRACE_OLDSETOPTIONS should be accepted Greg KH
2007-02-21 11:55   ` [patch 00/18] 2.6.18-stable review S.Çağlar Onur
2007-02-21 17:34     ` [stable] " Greg KH
2007-02-21 18:30       ` S.Çağlar Onur
2007-02-21 18:45       ` Ismail Dönmez
2007-02-22  5:42       ` Willy Tarreau
2007-02-26  0:00       ` Adrian Bunk
2007-02-26  0:18     ` Adrian Bunk
2007-03-05 13:44       ` S.Çağlar Onur
2007-03-05 19:26         ` Greg KH
2007-03-05 20:13           ` S.Çağlar Onur
2007-02-23 20:21   ` Hugh Dickins
2007-02-23 20:34     ` [stable] " Chris Wright
2007-02-23 21:13       ` Hugh Dickins

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20070221015021.GH3684@kroah.com \
    --to=greg@kroah.com \
    --cc=akpm@linux-foundation.org \
    --cc=akpm@osdl.org \
    --cc=alan@lxorguk.ukuu.org.uk \
    --cc=chrisw@sous-sol.org \
    --cc=chuckw@quantumlinux.com \
    --cc=davej@redhat.com \
    --cc=jmforbes@linuxtx.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mkrufky@linuxtv.org \
    --cc=rdunlap@xenotime.net \
    --cc=reviews@ml.cw.f00f.org \
    --cc=sandeen@redhat.com \
    --cc=stable@kernel.org \
    --cc=torvalds@linux-foundation.org \
    --cc=torvalds@osdl.org \
    --cc=tytso@mit.edu \
    --cc=zwane@arm.linux.org.uk \
    --subject='Re: [patch 07/18] grow_buffers() infinite loop fix (CVE-2006-5757, CVE-2006-6060)' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).