|
From: Anton A. <ai...@ca...> - 2004-05-10 09:21:14
|
I just released NTFS 2.1.9 for 2.6 kernel. You can find the patch below if you want to port it to the 2.4 kernel... (In fact it should pretty much just apply as is to 2.4...) Best regards, =09Anton --=20 Anton Altaparmakov <aia21 at cam.ac.uk> (replace at with @) Unix Support, Computing Service, University of Cambridge, CB2 3QH, UK Linux NTFS maintainer / IRC: #ntfs on irc.freenode.net WWW: http://linux-ntfs.sf.net/ & http://www-stu.christs.cam.ac.uk/~aia21/ ---------- Forwarded message ---------- Date: Mon, 10 May 2004 10:15:40 +0100 (BST) From: Anton Altaparmakov <ai...@ca...> To: Andrew Morton <ak...@os...>, Linus Torvalds <tor...@os...> Cc: lin...@vg..., m.g...@co... Subject: [2.6.6-bk] NTFS 2.1.9 release - Fix two bugs in the decompression engine. Hi Andrew, Hi Linus, please do a =09bk pull http://linux-ntfs.bkbits.net/ntfs-2.6 Thanks! This fixes two bugs in the NTFS decompression engine, one of which was reported by Marcin Gibu=C5=82a a few days ago on lkml. Many thanks go = to him for the bug report, the help in tracking down the bug and testing the fix. Best regards, =09Anton --=20 Anton Altaparmakov <aia21 at cam.ac.uk> (replace at with @) Unix Support, Computing Service, University of Cambridge, CB2 3QH, UK Linux NTFS maintainer / IRC: #ntfs on irc.freenode.net WWW: http://linux-ntfs.sf.net/, http://www-stu.christs.cam.ac.uk/~aia21/ =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D This will update the following files: Documentation/filesystems/ntfs.txt | 2 ++ fs/ntfs/ChangeLog | 14 +++++++++++++- fs/ntfs/Makefile | 2 +- fs/ntfs/compress.c | 29 ++++++++++++++++++++++------- 4 files changed, 38 insertions(+), 9 deletions(-) through these ChangeSets: <ai...@ca...> (04/05/10 1.1611) NTFS: 2.1.9 release - Fix two bugs in the decompression engine in handling of corner cases. diff -Nru a/Documentation/filesystems/ntfs.txt b/Documentation/filesystems/= ntfs.txt --- a/Documentation/filesystems/ntfs.txt=09Mon May 10 10:09:16 2004 +++ b/Documentation/filesystems/ntfs.txt=09Mon May 10 10:09:16 2004 @@ -273,6 +273,8 @@ Note, a technical ChangeLog aimed at kernel hackers is in fs/ntfs/ChangeLo= g. +2.1.9: +=09- Fix two bugs in handling of corner cases in the decompression engine. 2.1.8: =09- Read the $MFT mirror and compare it to the $MFT and if the two do not =09 match, force a read-only mount and do not allow read-write remounts. diff -Nru a/fs/ntfs/ChangeLog b/fs/ntfs/ChangeLog --- a/fs/ntfs/ChangeLog=09Mon May 10 10:09:16 2004 +++ b/fs/ntfs/ChangeLog=09Mon May 10 10:09:16 2004 @@ -19,7 +19,19 @@ =09 sufficient for synchronisation here. We then just need to make sure =09 ntfs_readpage/writepage/truncate interoperate properly with us. -2.1.8 - Handle $MFT mirror and $LogFile, improve time ihandling, and clean= ups. +2.1.9 - Fix two bugs in decompression engine. + +=09- Fix a bug where we would not always detect that we have reached the +=09 end of a compression block because we were ending at minus one byte +=09 which is effectively the same as being at the end. The fix is to +=09 check whether the uncompressed buffer has been fully filled and if so +=09 we assume we have reached the end of the compression block. A big +=09 thank you to Marcin Gibu=C5=82a for the bug report, the assistance in +=09 tracking down the bug and testing the fix. +=09- Fix a possible bug where when a compressed read is truncated to the +=09 end of the file, the offset inside the last page was not truncated. + +2.1.8 - Handle $MFT mirror and $LogFile, improve time handling, and cleanu= ps. =09- Use get_bh() instead of manual atomic_inc() in fs/ntfs/compress.c. =09- Modify fs/ntfs/time.c::ntfs2utc(), get_current_ntfs_time(), and diff -Nru a/fs/ntfs/Makefile b/fs/ntfs/Makefile --- a/fs/ntfs/Makefile=09Mon May 10 10:09:16 2004 +++ b/fs/ntfs/Makefile=09Mon May 10 10:09:16 2004 @@ -5,7 +5,7 @@ ntfs-objs :=3D aops.o attrib.o compress.o debug.o dir.o file.o inode.o log= file.o \ =09 mft.o mst.o namei.o super.o sysctl.o unistr.o upcase.o -EXTRA_CFLAGS =3D -DNTFS_VERSION=3D\"2.1.8\" +EXTRA_CFLAGS =3D -DNTFS_VERSION=3D\"2.1.9\" ifeq ($(CONFIG_NTFS_DEBUG),y) EXTRA_CFLAGS +=3D -DDEBUG diff -Nru a/fs/ntfs/compress.c b/fs/ntfs/compress.c --- a/fs/ntfs/compress.c=09Mon May 10 10:09:16 2004 +++ b/fs/ntfs/compress.c=09Mon May 10 10:09:16 2004 @@ -197,9 +197,15 @@ do_next_sb: =09ntfs_debug("Beginning sub-block at offset =3D 0x%x in the cb.", =09=09=09cb - cb_start); - -=09/* Have we reached the end of the compression block? */ -=09if (cb =3D=3D cb_end || !le16_to_cpup((u16*)cb)) { +=09/* +=09 * Have we reached the end of the compression block or the end of the +=09 * decompressed data? The latter can happen for example if the current +=09 * position in the compression block is one byte before its end so the +=09 * first two checks do not detect it. +=09 */ +=09if (cb =3D=3D cb_end || !le16_to_cpup((u16*)cb) || +=09=09=09(*dest_index =3D=3D dest_max_index && +=09=09=09*dest_ofs =3D=3D dest_max_ofs)) { =09=09int i; =09=09ntfs_debug("Completed. Returning success (0)."); @@ -501,7 +507,7 @@ =09 */ =09unsigned int nr_pages =3D (end_vcn - start_vcn) << =09=09=09vol->cluster_size_bits >> PAGE_CACHE_SHIFT; -=09unsigned int xpage, max_page, cur_page, cur_ofs, i; +=09unsigned int xpage, max_page, max_ofs, cur_page, cur_ofs, i; =09unsigned int cb_clusters, cb_max_ofs; =09int block, max_block, cb_max_page, bhs_size, nr_bhs, err =3D 0; =09struct page **pages; @@ -544,8 +550,11 @@ =09 */ =09max_page =3D ((VFS_I(ni)->i_size + PAGE_CACHE_SIZE - 1) >> =09=09=09PAGE_CACHE_SHIFT) - offset; -=09if (nr_pages < max_page) +=09max_ofs =3D (VFS_I(ni)->i_size + PAGE_CACHE_SIZE - 1) & ~PAGE_CACHE_MAS= K; +=09if (nr_pages < max_page) { =09=09max_page =3D nr_pages; +=09=09max_ofs =3D 0; +=09} =09for (i =3D 0; i < max_page; i++, offset++) { =09=09if (i !=3D xpage) =09=09=09pages[i] =3D grab_cache_page_nowait(mapping, offset); @@ -713,8 +722,14 @@ =09cb_max_page >>=3D PAGE_CACHE_SHIFT; =09/* Catch end of file inside a compression block. */ -=09if (cb_max_page > max_page) -=09=09cb_max_page =3D max_page; +=09if (cb_max_page >=3D max_page) { +=09=09if (cb_max_page > max_page) { +=09=09=09cb_max_page =3D max_page; +=09=09=09cb_max_ofs =3D max_ofs; +=09=09} else if (cb_max_ofs > max_ofs) { +=09=09=09cb_max_ofs =3D max_ofs; +=09=09} +=09} =09if (vcn =3D=3D start_vcn - cb_clusters) { =09=09/* Sparse cb, zero out page range overlapping the cb. */ =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D This BitKeeper patch contains the following changesets: 1.1611 ## Wrapped with gzip_uu ## M'XL( +Y> [U8Z6[;1A#^+3[%-"D"V[&D7=3DY4*C>.KQB)$\-V@J(P("S) MI468(@7NRD>C]$??K>_5V:5N6:VO5!(D<G?VF_OCV"_AB^!EJ\929E+C);PO MA&S5(I9+%C9R+G'II"APJ=3DDM>KPIRJB9RT34S89KX-XQDU$7KG@I6C7:L"8K M\K;/6[63O8,O'[=3D/#*/=3DAITNRR_X*9?0;ANR**]8%HNW3':S(F_(DN6BQR5K M1$5O.!$=3DFH28^':H9Q'''5*7V-XPHC&ES*8\)J;MN[:A;7\[M7D>P,;CA/AF M8#M#8EG4,W:!-JA+*1"[29PF)4""EN.VB/F:T!8AL @(KVVH$^,=3D/*_=3D.T8$ MG\[V3UM@-F@C@))GG D.=3D=3DA/;T!>%Q .+@2D.<@NAYBCCG[)A4B+''A^D>8< M :H7RJ#R.$OS"R@2B(HRYR5$B"8:Q@>P+.(;Q],<&/4'O@R#,&)LP;L/PT3H M"F@>L4N>I!D?TL CA.+;(H$3# G>>,.$1S1TJ$/MF%CA<DB78::I<AS;'YH! M(E8:=3DXMHT.-X4J+G324L;H7DO0JA(6_D'380.O0<XG*/)"9WPSBTPF4C[H&\ M8)9K^J8W'X@JJA^+B[NL<(=3DQXB8!HV@,3RPOL5>'8@JTH-2R@L"95SJNA49T MEU:TD]HTB3R?>;%G,]-=3DK74&:3$%MF][NGG_.TZJJY\Q5<L]?>]4$8^Z#GX/ M'2>P+-WLMCW?ZD[+]E>VNOFC6OU+/V:20U*4\_VN&K0JJ\]0+Z_U!SON^!Y1 M?T0?'YJ> Z:A+6@9M66N6<4C_\9##5TE2W4\*HI'-LIR#:QJE%'*_:&-67 K M?K>]!^2<6E"G_WO2J[9>2/J2CX_(\:YI L5,X[=3D59?J.9\K=3D>3P?EP13@G#=3D MY26':_P4@RR&O)# LFMV*_"XY)'$BF!2[7?9%4??6-3EL2H3HP:(&:LB8C"K M*,R*Z!)"'K&!J)"5!A15)8=3D8O30?""AR#N&MU##7W10GBE0 3_"I(M,KGMWJ M2A2LQX$)!!N=3D58N(U XPZL$O<!3LE @:!>J17=3D0IM2"@WQL%EH<#A"[1"\4 M&L\A&62H!%LNPTUL"$@3$!KH6JD4V)=3DW>3UV65TN.8UF;4.87B@4#%M^";?% M ,V#(U9&F)"#-!S\_1?3M:( 5/Q+WB]*N:GO46TJ),LCCNG3("6++I7K<7&=3D M3XXH:R474FW(*@R-:5+[!:*$&9_-;A<=3DGB8)/4&/8AVZ$H.$Y1LK*^>36B%G MO#*M2!*!?93F(HVY7LF8D-!G%PB/,55U,P%31::*TL>B?*_(AL//1_MGF/FR M1->5_3]CW>]K]!2-*C#(,NWQ"35M:J$(&RD?],4\^8SGB07N>=3D"TLIIY%J:5 M"?'@M$("33R^]1#>^<&THP9S57^8/DT#BG6JP6H%ZXS]>PSI^(ISU-?>;V<G MVYV=3D_8_;!Z?0AOJN&G([7_=3D.3@\_?VJ?O]"FG+^82]MT"EE(W$,'G=3D6Y6QQT M;-,G ;4<?&P$EEL]-IS@(9,"C@K>#TG?\U"P^N/@.3A8X3R=3DA!7*\["PMN?I M-*Q@5O'P^<TW0FWS^WW96&/=3DGXZG&7X:'\]D^$F$C*R@9_T5K##MG$<-(]@\ M%DXCQ(3 J#4W\"FR@<1_I5-WWZS!* U3&0TS'6(0 RF/_5J57<:DU(.KFF?[ M?55+",!O6*^/L4Y'2@9EB>.U!L(\I&K,'D^YRP:DTX[ ZD0XQ)%"&R2*B4%) M6F*<U9RE:QV;M-#!'O5J*AM*K&G4T(:U*$2R@RCL*)#A$'[*.'4[LNA$_4%_ M;6U W8WU*%S'+:-6JZUMQ%A'G32/^8TZI^]Z[&:T\NJ5$JIDBD3,2>#]^CI\ M,W8=3D8BN6KGYJ RR/BQPCE^82;E1Q;((2GU[AP4T5I]&2NM)+Z1O$PA%;8>&/ M:=3D1&TLCW:U^1[0_7\G2]OI5V1/H'A]=3DPO'VPU]G9WGF_USD]_'T/ZY^NPROX M<V;]:/OTPYLJ,'FE4, O$WN4^:C+5[IFE!$\\=3DW8Q><P;AQZU -_'-O.^"AL MM>=3D@:LL""_NUV<WIX3<S6Y7ZT97:^ X\$[JVUF9$ML8B\\#+IY4;DW^?5;4S 2Z+6#P'=3DYY/K&/T+)/F"H$P |
|
From: Pawel K. <pk...@be...> - 2004-05-10 10:14:00
|
On Mon, 10 May 2004, Anton Altaparmakov wrote: > I just released NTFS 2.1.9 for 2.6 kernel. You can find the patch below > if you want to port it to the 2.4 kernel... (In fact it should pretty > much just apply as is to 2.4...) Thanks, I'm looking over the earlier patches also. Are there 2.1.6 -> 2.1.7 and 2.1.7 -> 2.1.8 changes in diff format anywhere? take care, pkot -- p k o t a t b e z s e n s u d o t p l http://www.gnokii.org/ |
|
From: Anton A. <ai...@ca...> - 2004-05-10 10:38:00
|
On Mon, 2004-05-10 at 11:13, Pawel Kot wrote: > On Mon, 10 May 2004, Ant > take care, > pkoton Altaparmakov wrote: > > I just released NTFS 2.1.9 for 2.6 kernel. You can find the patch below > > if you want to port it to the 2.4 kernel... (In fact it should pretty > > much just apply as is to 2.4...) > > Thanks, I'm looking over the earlier patches also. Are there 2.1.6 -> > 2.1.7 and 2.1.7 -> 2.1.8 changes in diff format anywhere? 2.1.7->2.1.8: http://www-uxsup.csx.cam.ac.uk/~aia21/linux/ There is an uncompessed patch and a bzip2-ed patch. The filename is: linux-2.6.6-rc3-bk-ntfs-2.1.8.diff[.bz2] 2.1.6->2.1.7: sorry no )-: I will forward you the email containg the BK patches though. If you apply those (just use patch as usual) to 2.1.6 and then diff against 2.1.6 you would get a normal diff patch 2.1.6->2.1.7... Best regards, Anton -- Anton Altaparmakov <aia21 at cam.ac.uk> (replace at with @) Unix Support, Computing Service, University of Cambridge, CB2 3QH, UK Linux NTFS maintainer / IRC: #ntfs on irc.freenode.net WWW: http://linux-ntfs.sf.net/ & http://www-stu.christs.cam.ac.uk/~aia21/ |
