Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@penguin.transmeta.com>2002-05-02 02:51:06 -0700
committerLinus Torvalds <torvalds@penguin.transmeta.com>2002-05-02 02:51:06 -0700
commitdc0a81a9ebf56eb7cc11aa5f59318ac9ecff2578 (patch)
treebcf9ef587e8a388fd8a7d97aad8c0e7488b66738
parentf0a83a45d5b4a671e576334dc63227fd8912cb3b (diff)
parente751b54b584c74fd3255de911a22fcdeacea1944 (diff)
Merge http://linux-ntfs.bkbits.net/ntfs-tng-2.5
into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux
-rw-r--r--CREDITS5
-rw-r--r--MAINTAINERS3
-rw-r--r--drivers/video/matrox/matroxfb_base.c2
-rw-r--r--fs/ntfs/ChangeLog14
-rw-r--r--fs/ntfs/Makefile2
-rw-r--r--fs/ntfs/inode.c3
-rw-r--r--fs/ntfs/mft.c2
-rw-r--r--fs/ntfs/super.c11
-rw-r--r--fs/ntfs/upcase.c2
-rw-r--r--fs/partitions/ldm.c2
-rw-r--r--fs/partitions/ldm.h2
11 files changed, 29 insertions, 19 deletions
diff --git a/CREDITS b/CREDITS
index 0a2d3f0de08e..e305cd4c60d6 100644
--- a/CREDITS
+++ b/CREDITS
@@ -63,10 +63,9 @@ S: B-2610 Wilrijk-Antwerpen
S: Belgium
N: Anton Altaparmakov
-E: aia21@cus.cam.ac.uk
+E: aia21@cantab.net
W: http://www-stu.christs.cam.ac.uk/~aia21/
-D: NTFS driver maintainer. NTFS fixes and cleanup.
-D: Tiny fixes in linear md device and emu10k1 driver.
+D: Author of new NTFS driver, various other kernel hacks.
S: Christ's College
S: Cambridge CB2 3BU
S: United Kingdom
diff --git a/MAINTAINERS b/MAINTAINERS
index 11a48068e3d9..a3899aa45a9f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1146,9 +1146,10 @@ S: Maintained
NTFS FILESYSTEM
P: Anton Altaparmakov
-M: aia21@cus.cam.ac.uk
+M: aia21@cantab.net
L: linux-ntfs-dev@lists.sourceforge.net
L: linux-kernel@vger.kernel.org
+W: http://linux-ntfs.sf.net/
S: Maintained
NVIDIA (RIVA) FRAMEBUFFER DRIVER
diff --git a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c
index 4f0551f89265..431a2896ce25 100644
--- a/drivers/video/matrox/matroxfb_base.c
+++ b/drivers/video/matrox/matroxfb_base.c
@@ -68,7 +68,7 @@
* "Samuel Hocevar" <sam@via.ecp.fr>
* Fixes
*
- * "Anton Altaparmakov" <AntonA@bigfoot.com>
+ * "Anton Altaparmakov"
* G400 MAX/non-MAX distinction
*
* "Ken Aaker" <kdaaker@rchland.vnet.ibm.com>
diff --git a/fs/ntfs/ChangeLog b/fs/ntfs/ChangeLog
index 47d0894da3a4..b6243c47d755 100644
--- a/fs/ntfs/ChangeLog
+++ b/fs/ntfs/ChangeLog
@@ -27,6 +27,18 @@ ToDo:
quite big. Modularising them a bit, e.g. a-la get_block(), will make
them cleaner and make code reuse easier.
+2.0.5 - Major bugfix. Buffer overflow in extent inode handling.
+
+ - No need to set old blocksize in super.c::ntfs_fill_super() as the
+ VFS does so via invocation of deactivate_super() calling
+ fs->fill_super() calling block_kill_super() which does it.
+ - BKL moved from VFS into dir.c::ntfs_readdir(). (Linus Torvalds)
+ -> Do we really need it? I don't think so as we have exclusion on
+ the directory ntfs_inode rw_semaphore mrec_lock. We mmight have to
+ move the ->f_pos accesses under the mrec_lock though. Check this...
+ - Fix really, really, really stupid buffer overflow in extent inode
+ handling in mft.c::map_extent_mft_record().
+
2.0.4 - Cleanups and updates for kernel 2.5.11.
- Add documentation on how to use the MD driver to be able to use NTFS
@@ -35,7 +47,7 @@ ToDo:
Remove all uses of kdev_t in favour of struct block_device *:
- Change compress.c::ntfs_file_read_compressed_block() to use
sb_getblk() instead of getblk().
- - Change super.c::ntfs_fill_suoer() to use bdev_hardsect_size() instead
+ - Change super.c::ntfs_fill_super() to use bdev_hardsect_size() instead
of get_hardsect_size().
- No need to get old blocksize in super.c::ntfs_fill_super() as
fs/super.c::get_sb_bdev() already does this.
diff --git a/fs/ntfs/Makefile b/fs/ntfs/Makefile
index b78f732ae734..e158bc7d2874 100644
--- a/fs/ntfs/Makefile
+++ b/fs/ntfs/Makefile
@@ -7,7 +7,7 @@ obj-y := aops.o attrib.o compress.o debug.o dir.o file.o inode.o mft.o \
obj-m := $(O_TARGET)
-EXTRA_CFLAGS = -DNTFS_VERSION=\"2.0.4\"
+EXTRA_CFLAGS = -DNTFS_VERSION=\"2.0.5\"
ifeq ($(CONFIG_NTFS_DEBUG),y)
EXTRA_CFLAGS += -DDEBUG
diff --git a/fs/ntfs/inode.c b/fs/ntfs/inode.c
index af0368d68678..2964dbfe47bf 100644
--- a/fs/ntfs/inode.c
+++ b/fs/ntfs/inode.c
@@ -1191,7 +1191,8 @@ void ntfs_read_inode_mount(struct inode *vi)
"for $MFT/$DATA. Driver bug or "
"corrupt $MFT. Run chkdsk.");
ntfs_debug("highest_vcn = 0x%Lx, last_vcn - 1 = 0x%Lx",
- (long long)highest_vcn, (long long)last_vcn - 1);
+ (long long)highest_vcn,
+ (long long)last_vcn - 1);
goto put_err_out;
}
put_attr_search_ctx(ctx);
diff --git a/fs/ntfs/mft.c b/fs/ntfs/mft.c
index 016054181094..d7c7177c9802 100644
--- a/fs/ntfs/mft.c
+++ b/fs/ntfs/mft.c
@@ -459,7 +459,7 @@ map_err_out:
goto unm_err_out;
}
/* Attach extent inode to base inode, reallocating memory if needed. */
- if (!(base_ni->nr_extents & ~3)) {
+ if (!(base_ni->nr_extents & 3)) {
ntfs_inode **tmp;
int new_size = (base_ni->nr_extents + 4) * sizeof(ntfs_inode *);
diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c
index 9a2bc86fd4ff..1009315877b8 100644
--- a/fs/ntfs/super.c
+++ b/fs/ntfs/super.c
@@ -1555,7 +1555,7 @@ static int ntfs_fill_super(struct super_block *sb, void *opt, const int silent)
if (sb_set_blocksize(sb, NTFS_BLOCK_SIZE) != NTFS_BLOCK_SIZE) {
if (!silent)
ntfs_error(sb, "Unable to set block size.");
- goto set_blk_size_err_out_now;
+ goto err_out_now;
}
/* Get the size of the device in units of NTFS_BLOCK_SIZE bytes. */
@@ -1565,7 +1565,7 @@ static int ntfs_fill_super(struct super_block *sb, void *opt, const int silent)
if (!(bh = read_ntfs_boot_sector(sb, silent))) {
if (!silent)
ntfs_error(sb, "Not an NTFS volume.");
- goto set_blk_size_err_out_now;
+ goto err_out_now;
}
/*
@@ -1579,7 +1579,7 @@ static int ntfs_fill_super(struct super_block *sb, void *opt, const int silent)
if (!result) {
if (!silent)
ntfs_error(sb, "Unsupported NTFS filesystem.");
- goto set_blk_size_err_out_now;
+ goto err_out_now;
}
/*
@@ -1750,10 +1750,7 @@ cond_iput_mft_ino_err_out_now:
printk("VFS: Busy inodes after umount. Self-destruct in 5 "
"seconds. Have a nice day...\n");
}
-set_blk_size_err_out_now:
/* Errors at this stage are irrelevant. */
- // FIXME: This should be done in fs/super.c::get_sb_bdev() itself! (AIA)
- sb_set_blocksize(sb, sb->s_old_blocksize);
err_out_now:
sb->u.generic_sbp = NULL;
kfree(vol);
@@ -1936,7 +1933,7 @@ static void __exit exit_ntfs_fs(void)
}
EXPORT_NO_SYMBOLS;
-MODULE_AUTHOR("Anton Altaparmakov <aia21@cam.ac.uk>");
+MODULE_AUTHOR("Anton Altaparmakov <aia21@cantab.net>");
MODULE_DESCRIPTION("NTFS 1.2/3.x driver");
MODULE_LICENSE("GPL");
#ifdef DEBUG
diff --git a/fs/ntfs/upcase.c b/fs/ntfs/upcase.c
index 2dda6861f307..17f4a64c70b7 100644
--- a/fs/ntfs/upcase.c
+++ b/fs/ntfs/upcase.c
@@ -3,7 +3,7 @@
* Part of the Linux-NTFS project.
*
* Copyright (C) 2001 Richard Russon <ntfs@flatcap.org>
- * Copyright (c) 2001 Anton Altaparmakov <aia21@cam.ac.uk>
+ * Copyright (c) 2001,2002 Anton Altaparmakov
*
* Modified for mkntfs inclusion 9 June 2001 by Anton Altaparmakov.
* Modified for kernel inclusion 10 September 2001 by Anton Altparmakov.
diff --git a/fs/partitions/ldm.c b/fs/partitions/ldm.c
index 8a7a27cb03a2..895e6465d904 100644
--- a/fs/partitions/ldm.c
+++ b/fs/partitions/ldm.c
@@ -2,7 +2,7 @@
* ldm - Part of the Linux-NTFS project.
*
* Copyright (C) 2001 Richard Russon <ldm@flatcap.org>
- * Copyright (C) 2001 Anton Altaparmakov <antona@users.sf.net> (AIA)
+ * Copyright (C) 2001 Anton Altaparmakov (AIA)
*
* Documentation is available at http://linux-ntfs.sf.net/ldm
*
diff --git a/fs/partitions/ldm.h b/fs/partitions/ldm.h
index 6f452ba450c8..b1255e84c632 100644
--- a/fs/partitions/ldm.h
+++ b/fs/partitions/ldm.h
@@ -4,7 +4,7 @@
* ldm - Part of the Linux-NTFS project.
*
* Copyright (C) 2001 Richard Russon <ldm@flatcap.org>
- * Copyright (C) 2001 Anton Altaparmakov <antona@users.sf.net>
+ * Copyright (C) 2001 Anton Altaparmakov
*
* Documentation is available at http://linux-ntfs.sf.net/ldm
*