mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Ben Hutchings <ben@decadent.org.uk>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: akpm@linux-foundation.org, "Eryu Guan" <guaneryu@gmail.com>,
	"Andreas Dilger" <adilger@dilger.ca>,
	"Theodore Ts'o" <tytso@mit.edu>, "Ralf Spenneberg" <ralf@os-t.de>
Subject: [PATCH 3.16 03/12] ext4: validate s_first_meta_bg at mount time
Date: Fri, 24 Feb 2017 12:10:01 +0000	[thread overview]
Message-ID: <lsq.1487938201.716558459@decadent.org.uk> (raw)
In-Reply-To: <lsq.1487938201.529166958@decadent.org.uk>

3.16.41-rc1 review patch.  If anyone has any objections, please let me know.

------------------

From: Eryu Guan <guaneryu@gmail.com>

commit 3a4b77cd47bb837b8557595ec7425f281f2ca1fe upstream.

Ralf Spenneberg reported that he hit a kernel crash when mounting a
modified ext4 image. And it turns out that kernel crashed when
calculating fs overhead (ext4_calculate_overhead()), this is because
the image has very large s_first_meta_bg (debug code shows it's
842150400), and ext4 overruns the memory in count_overhead() when
setting bitmap buffer, which is PAGE_SIZE.

ext4_calculate_overhead():
  buf = get_zeroed_page(GFP_NOFS);  <=== PAGE_SIZE buffer
  blks = count_overhead(sb, i, buf);

count_overhead():
  for (j = ext4_bg_num_gdb(sb, grp); j > 0; j--) { <=== j = 842150400
          ext4_set_bit(EXT4_B2C(sbi, s++), buf);   <=== buffer overrun
          count++;
  }

This can be reproduced easily for me by this script:

  #!/bin/bash
  rm -f fs.img
  mkdir -p /mnt/ext4
  fallocate -l 16M fs.img
  mke2fs -t ext4 -O bigalloc,meta_bg,^resize_inode -F fs.img
  debugfs -w -R "ssv first_meta_bg 842150400" fs.img
  mount -o loop fs.img /mnt/ext4

Fix it by validating s_first_meta_bg first at mount time, and
refusing to mount if its value exceeds the largest possible meta_bg
number.

Reported-by: Ralf Spenneberg <ralf@os-t.de>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Reviewed-by: Andreas Dilger <adilger@dilger.ca>
[bwh: Backported to 3.16: use EXT4_HAS_INCOMPAT_FEATURE()]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
 fs/ext4/super.c | 9 +++++++++
 1 file changed, 9 insertions(+)

--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -3905,6 +3905,15 @@ static int ext4_fill_super(struct super_
 			(EXT4_MAX_BLOCK_FILE_PHYS / EXT4_BLOCKS_PER_GROUP(sb)));
 	db_count = (sbi->s_groups_count + EXT4_DESC_PER_BLOCK(sb) - 1) /
 		   EXT4_DESC_PER_BLOCK(sb);
+	if (EXT4_HAS_INCOMPAT_FEATURE(sb,EXT4_FEATURE_INCOMPAT_META_BG)) {
+		if (le32_to_cpu(es->s_first_meta_bg) >= db_count) {
+			ext4_msg(sb, KERN_WARNING,
+				 "first meta block group too large: %u "
+				 "(group descriptor block count %u)",
+				 le32_to_cpu(es->s_first_meta_bg), db_count);
+			goto failed_mount;
+		}
+	}
 	sbi->s_group_desc = ext4_kvmalloc(db_count *
 					  sizeof(struct buffer_head *),
 					  GFP_KERNEL);

  reply	other threads:[~2017-02-24 13:10 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-02-24 12:10 [PATCH 3.16 00/12] 3.16.41-rc1 review Ben Hutchings
2017-02-24 12:10 ` Ben Hutchings [this message]
2017-02-24 12:10 ` [PATCH 3.16 07/12] USB: serial: kl5kusb105: fix line-state error handling Ben Hutchings
2017-02-24 12:10 ` [PATCH 3.16 06/12] selinux: fix off-by-one in setprocattr Ben Hutchings
2017-02-24 12:10 ` [PATCH 3.16 08/12] tmpfs: clear S_ISGID when setting posix ACLs Ben Hutchings
2017-02-24 12:10 ` [PATCH 3.16 09/12] ip6_gre: fix ip6gre_err() invalid reads Ben Hutchings
2017-02-24 12:10 ` [PATCH 3.16 12/12] tcp: avoid infinite loop in tcp_splice_read() Ben Hutchings
2017-02-24 12:10 ` [PATCH 3.16 10/12] ipv4: keep skb->dst around in presence of IP options Ben Hutchings
2017-02-24 12:10 ` [PATCH 3.16 11/12] dccp: fix freeing skb too early for IPV6_RECVPKTINFO Ben Hutchings
2017-02-24 12:10 ` [PATCH 3.16 04/12] KVM: x86: fix emulation of "MOV SS, null selector" Ben Hutchings
2017-02-24 12:10 ` [PATCH 3.16 02/12] kvm: nVMX: Allow L1 to intercept software exceptions (#BP and #OF) Ben Hutchings
2017-02-24 12:10 ` [PATCH 3.16 05/12] KVM: x86: Introduce segmented_write_std Ben Hutchings
2017-02-24 12:10 ` [PATCH 3.16 01/12] mnt: Add a per mount namespace limit on the number of mounts Ben Hutchings
2017-02-24 16:19 ` [PATCH 3.16 00/12] 3.16.41-rc1 review Guenter Roeck

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=lsq.1487938201.716558459@decadent.org.uk \
    --to=ben@decadent.org.uk \
    --cc=adilger@dilger.ca \
    --cc=akpm@linux-foundation.org \
    --cc=guaneryu@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=ralf@os-t.de \
    --cc=stable@vger.kernel.org \
    --cc=tytso@mit.edu \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome