You can subscribe to this list here.
| 2001 |
Jan
(1) |
Feb
(1) |
Mar
(23) |
Apr
(1) |
May
(16) |
Jun
(5) |
Jul
(23) |
Aug
(29) |
Sep
(16) |
Oct
(4) |
Nov
(12) |
Dec
(9) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(8) |
Feb
(4) |
Mar
(20) |
Apr
(25) |
May
(19) |
Jun
(6) |
Jul
(43) |
Aug
(22) |
Sep
(7) |
Oct
(17) |
Nov
(26) |
Dec
(54) |
| 2003 |
Jan
(50) |
Feb
(51) |
Mar
(93) |
Apr
(105) |
May
(46) |
Jun
(62) |
Jul
(71) |
Aug
(28) |
Sep
(25) |
Oct
(28) |
Nov
(41) |
Dec
(17) |
| 2004 |
Jan
(39) |
Feb
(94) |
Mar
(139) |
Apr
(46) |
May
(103) |
Jun
(23) |
Jul
(74) |
Aug
(42) |
Sep
(127) |
Oct
(122) |
Nov
(80) |
Dec
(43) |
| 2005 |
Jan
(66) |
Feb
(35) |
Mar
(21) |
Apr
(42) |
May
(57) |
Jun
(136) |
Jul
(239) |
Aug
(255) |
Sep
(221) |
Oct
(295) |
Nov
(250) |
Dec
(66) |
| 2006 |
Jan
(116) |
Feb
(142) |
Mar
(66) |
Apr
(61) |
May
(56) |
Jun
(47) |
Jul
(82) |
Aug
(202) |
Sep
(106) |
Oct
(85) |
Nov
(130) |
Dec
(58) |
| 2007 |
Jan
(122) |
Feb
(7) |
Mar
(27) |
Apr
(19) |
May
(23) |
Jun
(17) |
Jul
(18) |
Aug
(19) |
Sep
(38) |
Oct
(39) |
Nov
(17) |
Dec
(6) |
| 2008 |
Jan
(8) |
Feb
(10) |
Mar
(6) |
Apr
(2) |
May
(29) |
Jun
(2) |
Jul
(16) |
Aug
(4) |
Sep
(7) |
Oct
(3) |
Nov
(6) |
Dec
(10) |
| 2009 |
Jan
(4) |
Feb
(4) |
Mar
(4) |
Apr
(12) |
May
(5) |
Jun
(8) |
Jul
(5) |
Aug
(17) |
Sep
(4) |
Oct
(7) |
Nov
(10) |
Dec
(18) |
| 2010 |
Jan
(7) |
Feb
(3) |
Mar
(6) |
Apr
(7) |
May
(3) |
Jun
(4) |
Jul
(2) |
Aug
(4) |
Sep
(12) |
Oct
|
Nov
(1) |
Dec
|
| 2011 |
Jan
(11) |
Feb
(5) |
Mar
(6) |
Apr
(9) |
May
|
Jun
(6) |
Jul
(14) |
Aug
(12) |
Sep
(1) |
Oct
(1) |
Nov
(1) |
Dec
(4) |
| 2012 |
Jan
(3) |
Feb
(5) |
Mar
(6) |
Apr
(9) |
May
(4) |
Jun
(8) |
Jul
(19) |
Aug
(12) |
Sep
(1) |
Oct
(3) |
Nov
(2) |
Dec
(2) |
| 2013 |
Jan
(2) |
Feb
(2) |
Mar
(3) |
Apr
(4) |
May
|
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
(4) |
Nov
|
Dec
(4) |
| 2014 |
Jan
|
Feb
(2) |
Mar
(7) |
Apr
(2) |
May
(11) |
Jun
(27) |
Jul
(5) |
Aug
|
Sep
(1) |
Oct
(3) |
Nov
(9) |
Dec
|
| 2015 |
Jan
(3) |
Feb
|
Mar
(3) |
Apr
(2) |
May
(1) |
Jun
(1) |
Jul
(6) |
Aug
(1) |
Sep
(5) |
Oct
|
Nov
|
Dec
(5) |
| 2016 |
Jan
|
Feb
|
Mar
(3) |
Apr
(25) |
May
(4) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(9) |
Dec
(32) |
| 2017 |
Jan
(44) |
Feb
(22) |
Mar
(12) |
Apr
|
May
(3) |
Jun
(9) |
Jul
(12) |
Aug
(3) |
Sep
|
Oct
(1) |
Nov
|
Dec
(5) |
| 2018 |
Jan
(5) |
Feb
(11) |
Mar
(3) |
Apr
(6) |
May
(3) |
Jun
(7) |
Jul
(5) |
Aug
|
Sep
|
Oct
(7) |
Nov
(2) |
Dec
|
| 2019 |
Jan
|
Feb
(1) |
Mar
|
Apr
(20) |
May
(1) |
Jun
(5) |
Jul
(10) |
Aug
(27) |
Sep
(2) |
Oct
|
Nov
(2) |
Dec
|
| 2020 |
Jan
(9) |
Feb
(8) |
Mar
(5) |
Apr
(20) |
May
(9) |
Jun
(8) |
Jul
(6) |
Aug
(6) |
Sep
(6) |
Oct
(151) |
Nov
(37) |
Dec
(59) |
| 2021 |
Jan
(46) |
Feb
(41) |
Mar
(55) |
Apr
(18) |
May
(33) |
Jun
(8) |
Jul
(28) |
Aug
(81) |
Sep
(9) |
Oct
(195) |
Nov
(48) |
Dec
(10) |
| 2022 |
Jan
(7) |
Feb
(1) |
Mar
(9) |
Apr
(8) |
May
(4) |
Jun
(102) |
Jul
(26) |
Aug
(52) |
Sep
(6) |
Oct
(27) |
Nov
(4) |
Dec
(22) |
| 2023 |
Jan
(9) |
Feb
(7) |
Mar
(19) |
Apr
(4) |
May
(30) |
Jun
(30) |
Jul
(27) |
Aug
(35) |
Sep
(78) |
Oct
(42) |
Nov
(20) |
Dec
(7) |
| 2024 |
Jan
(36) |
Feb
(8) |
Mar
(25) |
Apr
(27) |
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
(1) |
Nov
|
Dec
|
| 2025 |
Jan
(2) |
Feb
(4) |
Mar
(3) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Jan K. <ja...@su...> - 2024-01-15 14:38:39
|
On Mon 15-01-24 01:05:04, syzbot wrote: > syzbot suspects this issue was fixed by commit: > > commit 6f861765464f43a71462d52026fbddfc858239a5 > Author: Jan Kara <ja...@su...> > Date: Wed Nov 1 17:43:10 2023 +0000 > > fs: Block writes to mounted block devices > > bisection log: https://syzkaller.appspot.com/x/bisect.txt?x=11feec2be80000 > start commit: 831fe284d827 Merge tag 'spi-fix-v6.5-rc1' of git://git.ker.. > git tree: upstream > kernel config: https://syzkaller.appspot.com/x/.config?x=ae56ea581f8fd3f3 > dashboard link: https://syzkaller.appspot.com/bug?extid=84b5465f68c3eb82c161 > syz repro: https://syzkaller.appspot.com/x/repro.syz?x=13a52a24a80000 > C reproducer: https://syzkaller.appspot.com/x/repro.c?x=156f908aa80000 > > If the result looks correct, please mark the issue as fixed by replying with: Looks sensible: #syz fix: fs: Block writes to mounted block devices Honza -- Jan Kara <ja...@su...> SUSE Labs, CR |
|
From: Anton A. <an...@tu...> - 2024-01-15 13:35:44
|
Hi Matthew, On 15/01/2024 07:20, Matthew Wilcox (Oracle) wrote: > The replacement, NTFS3, was merged over two years ago. It is now time to > remove the original from the tree as it is the last user of several APIs, > and it is not worth changing. It was my impression that people are complaining ntfs3 is causing a whole lot of problems including corrupting people's data. Also, it appears the maintainer has basically disappeared after it got merged. Is it really such a good idea to remove the original ntfs driver which actually works fine and does not cause any problems when the replacement is so poor and unmaintained? Also, which APIs are you referring to? I can take a look into those. Best regards, Anton -- Anton Altaparmakov <anton at tuxera.com> (replace at with @) Lead in File System Development, Tuxera Inc., http://www.tuxera.com/ Linux NTFS maintainer |
|
From: Namjae J. <lin...@ke...> - 2024-01-15 11:42:00
|
2024-01-15 20:00 GMT+09:00, Anton Altaparmakov <an...@tu...>: > Hi Matthew, > > On 15/01/2024 07:20, Matthew Wilcox (Oracle) wrote: >> The replacement, NTFS3, was merged over two years ago. It is now time to >> remove the original from the tree as it is the last user of several APIs, >> and it is not worth changing. > > It was my impression that people are complaining ntfs3 is causing a > whole lot of problems including corrupting people's data. Also, it > appears the maintainer has basically disappeared after it got merged. What can replace this is not only ntfs3 but also ntfs3g. I think read-only ntfs is obsolete. I am in favor of remove it. Acked-by: Namjae Jeon <lin...@ke...> Thanks. > > Is it really such a good idea to remove the original ntfs driver which > actually works fine and does not cause any problems when the replacement > is so poor and unmaintained? > > Also, which APIs are you referring to? I can take a look into those. > > Best regards, > > Anton > -- > Anton Altaparmakov <anton at tuxera.com> (replace at with @) > Lead in File System Development, Tuxera Inc., http://www.tuxera.com/ > Linux NTFS maintainer > |
|
From: Enrico M. <mrk...@gm...> - 2024-01-15 11:08:47
|
On Mon, 15 Jan 2024, Anton Altaparmakov wrote: > Date: Mon, 15 Jan 2024 12:00:35 > From: Anton Altaparmakov <an...@tu...> > To: "Matthew Wilcox (Oracle)" <wi...@in...>, > Christian Brauner <br...@ke...> > Cc: lin...@vg..., lin...@li..., > nt...@li...v, Namjae Jeon <lin...@ke...> > Subject: Re: [PATCH] fs: Remove NTFS classic > > Hi Matthew, > > On 15/01/2024 07:20, Matthew Wilcox (Oracle) wrote: >> The replacement, NTFS3, was merged over two years ago. It is now time to >> remove the original from the tree as it is the last user of several APIs, >> and it is not worth changing. > > It was my impression that people are complaining ntfs3 is causing a whole lot > of problems including corrupting people's data. Also, it appears the > maintainer has basically disappeared after it got merged. To be fair - it's more like "intermittent" maintenance rather than "no maintenance". Konstantin - would it be OK for you to have a co-maintainer to help out? Enrico > > Is it really such a good idea to remove the original ntfs driver which > actually works fine and does not cause any problems when the replacement is > so poor and unmaintained? > > Also, which APIs are you referring to? I can take a look into those. > > Best regards, > > Anton > -- > Anton Altaparmakov <anton at tuxera.com> (replace at with @) > Lead in File System Development, Tuxera Inc., http://www.tuxera.com/ > Linux NTFS maintainer > > |
|
From: syzbot <syz...@sy...> - 2024-01-15 09:05:19
|
syzbot suspects this issue was fixed by commit:
commit 6f861765464f43a71462d52026fbddfc858239a5
Author: Jan Kara <ja...@su...>
Date: Wed Nov 1 17:43:10 2023 +0000
fs: Block writes to mounted block devices
bisection log: https://syzkaller.appspot.com/x/bisect.txt?x=11feec2be80000
start commit: 831fe284d827 Merge tag 'spi-fix-v6.5-rc1' of git://git.ker..
git tree: upstream
kernel config: https://syzkaller.appspot.com/x/.config?x=ae56ea581f8fd3f3
dashboard link: https://syzkaller.appspot.com/bug?extid=84b5465f68c3eb82c161
syz repro: https://syzkaller.appspot.com/x/repro.syz?x=13a52a24a80000
C reproducer: https://syzkaller.appspot.com/x/repro.c?x=156f908aa80000
If the result looks correct, please mark the issue as fixed by replying with:
#syz fix: fs: Block writes to mounted block devices
For information about bisection process see: https://goo.gl/tpsmEJ#bisection
|
|
From: Matthew W. (Oracle) <wi...@in...> - 2024-01-15 07:21:59
|
The replacement, NTFS3, was merged over two years ago. It is now time to remove the original from the tree as it is the last user of several APIs, and it is not worth changing. Signed-off-by: Matthew Wilcox (Oracle) <wi...@in...> Cc: Anton Altaparmakov <an...@tu...> Cc: Namjae Jeon <lin...@ke...> --- CREDITS | 5 + Documentation/filesystems/ntfs.rst | 466 ---- MAINTAINERS | 10 - fs/Kconfig | 1 - fs/Makefile | 1 - fs/ntfs/Kconfig | 81 - fs/ntfs/Makefile | 15 - fs/ntfs/aops.c | 1744 --------------- fs/ntfs/aops.h | 88 - fs/ntfs/attrib.c | 2624 ----------------------- fs/ntfs/attrib.h | 102 - fs/ntfs/bitmap.c | 179 -- fs/ntfs/bitmap.h | 104 - fs/ntfs/collate.c | 110 - fs/ntfs/collate.h | 36 - fs/ntfs/compress.c | 950 --------- fs/ntfs/debug.c | 159 -- fs/ntfs/debug.h | 57 - fs/ntfs/dir.c | 1540 ------------- fs/ntfs/dir.h | 34 - fs/ntfs/endian.h | 79 - fs/ntfs/file.c | 1997 ----------------- fs/ntfs/index.c | 440 ---- fs/ntfs/index.h | 134 -- fs/ntfs/inode.c | 3102 --------------------------- fs/ntfs/inode.h | 310 --- fs/ntfs/layout.h | 2421 --------------------- fs/ntfs/lcnalloc.c | 1000 --------- fs/ntfs/lcnalloc.h | 131 -- fs/ntfs/logfile.c | 849 -------- fs/ntfs/logfile.h | 295 --- fs/ntfs/malloc.h | 77 - fs/ntfs/mft.c | 2907 ------------------------- fs/ntfs/mft.h | 110 - fs/ntfs/mst.c | 189 -- fs/ntfs/namei.c | 392 ---- fs/ntfs/ntfs.h | 150 -- fs/ntfs/quota.c | 103 - fs/ntfs/quota.h | 21 - fs/ntfs/runlist.c | 1893 ---------------- fs/ntfs/runlist.h | 88 - fs/ntfs/super.c | 3202 ---------------------------- fs/ntfs/sysctl.c | 58 - fs/ntfs/sysctl.h | 27 - fs/ntfs/time.h | 89 - fs/ntfs/types.h | 55 - fs/ntfs/unistr.c | 384 ---- fs/ntfs/upcase.c | 73 - fs/ntfs/usnjrnl.c | 70 - fs/ntfs/usnjrnl.h | 191 -- fs/ntfs/volume.h | 164 -- 51 files changed, 5 insertions(+), 29302 deletions(-) delete mode 100644 Documentation/filesystems/ntfs.rst delete mode 100644 fs/ntfs/Kconfig delete mode 100644 fs/ntfs/Makefile delete mode 100644 fs/ntfs/aops.c delete mode 100644 fs/ntfs/aops.h delete mode 100644 fs/ntfs/attrib.c delete mode 100644 fs/ntfs/attrib.h delete mode 100644 fs/ntfs/bitmap.c delete mode 100644 fs/ntfs/bitmap.h delete mode 100644 fs/ntfs/collate.c delete mode 100644 fs/ntfs/collate.h delete mode 100644 fs/ntfs/compress.c delete mode 100644 fs/ntfs/debug.c delete mode 100644 fs/ntfs/debug.h delete mode 100644 fs/ntfs/dir.c delete mode 100644 fs/ntfs/dir.h delete mode 100644 fs/ntfs/endian.h delete mode 100644 fs/ntfs/file.c delete mode 100644 fs/ntfs/index.c delete mode 100644 fs/ntfs/index.h delete mode 100644 fs/ntfs/inode.c delete mode 100644 fs/ntfs/inode.h delete mode 100644 fs/ntfs/layout.h delete mode 100644 fs/ntfs/lcnalloc.c delete mode 100644 fs/ntfs/lcnalloc.h delete mode 100644 fs/ntfs/logfile.c delete mode 100644 fs/ntfs/logfile.h delete mode 100644 fs/ntfs/malloc.h delete mode 100644 fs/ntfs/mft.c delete mode 100644 fs/ntfs/mft.h delete mode 100644 fs/ntfs/mst.c delete mode 100644 fs/ntfs/namei.c delete mode 100644 fs/ntfs/ntfs.h delete mode 100644 fs/ntfs/quota.c delete mode 100644 fs/ntfs/quota.h delete mode 100644 fs/ntfs/runlist.c delete mode 100644 fs/ntfs/runlist.h delete mode 100644 fs/ntfs/super.c delete mode 100644 fs/ntfs/sysctl.c delete mode 100644 fs/ntfs/sysctl.h delete mode 100644 fs/ntfs/time.h delete mode 100644 fs/ntfs/types.h delete mode 100644 fs/ntfs/unistr.c delete mode 100644 fs/ntfs/upcase.c delete mode 100644 fs/ntfs/usnjrnl.c delete mode 100644 fs/ntfs/usnjrnl.h delete mode 100644 fs/ntfs/volume.h diff --git a/CREDITS b/CREDITS index 06b177c6af6a..78c0be09041b 100644 --- a/CREDITS +++ b/CREDITS @@ -63,6 +63,11 @@ D: dosfs, LILO, some fd features, ATM, various other hacks here and there S: Buenos Aires S: Argentina +NTFS FILESYSTEM +N: Anton Altaparmakov +E: an...@tu... +D: NTFS filesystem + N: Tim Alpaerts E: tim...@to... D: 802.2 class II logical link control layer, diff --git a/Documentation/filesystems/ntfs.rst b/Documentation/filesystems/ntfs.rst deleted file mode 100644 index 5bb093a26485..000000000000 --- a/Documentation/filesystems/ntfs.rst +++ /dev/null @@ -1,466 +0,0 @@ -.. SPDX-License-Identifier: GPL-2.0 - -================================ -The Linux NTFS filesystem driver -================================ - - -.. Table of contents - - - Overview - - Web site - - Features - - Supported mount options - - Known bugs and (mis-)features - - Using NTFS volume and stripe sets - - The Device-Mapper driver - - The Software RAID / MD driver - - Limitations when using the MD driver - - -Overview -======== - -Linux-NTFS comes with a number of user-space programs known as ntfsprogs. -These include mkntfs, a full-featured ntfs filesystem format utility, -ntfsundelete used for recovering files that were unintentionally deleted -from an NTFS volume and ntfsresize which is used to resize an NTFS partition. -See the web site for more information. - -To mount an NTFS 1.2/3.x (Windows NT4/2000/XP/2003) volume, use the file -system type 'ntfs'. The driver currently supports read-only mode (with no -fault-tolerance, encryption or journalling) and very limited, but safe, write -support. - -For fault tolerance and raid support (i.e. volume and stripe sets), you can -use the kernel's Software RAID / MD driver. See section "Using Software RAID -with NTFS" for details. - - -Web site -======== - -There is plenty of additional information on the linux-ntfs web site -at http://www.linux-ntfs.org/ - -The web site has a lot of additional information, such as a comprehensive -FAQ, documentation on the NTFS on-disk format, information on the Linux-NTFS -userspace utilities, etc. - - -Features -======== - -- This is a complete rewrite of the NTFS driver that used to be in the 2.4 and - earlier kernels. This new driver implements NTFS read support and is - functionally equivalent to the old ntfs driver and it also implements limited - write support. The biggest limitation at present is that files/directories - cannot be created or deleted. See below for the list of write features that - are so far supported. Another limitation is that writing to compressed files - is not implemented at all. Also, neither read nor write access to encrypted - files is so far implemented. -- The new driver has full support for sparse files on NTFS 3.x volumes which - the old driver isn't happy with. -- The new driver supports execution of binaries due to mmap() now being - supported. -- The new driver supports loopback mounting of files on NTFS which is used by - some Linux distributions to enable the user to run Linux from an NTFS - partition by creating a large file while in Windows and then loopback - mounting the file while in Linux and creating a Linux filesystem on it that - is used to install Linux on it. -- A comparison of the two drivers using:: - - time find . -type f -exec md5sum "{}" \; - - run three times in sequence with each driver (after a reboot) on a 1.4GiB - NTFS partition, showed the new driver to be 20% faster in total time elapsed - (from 9:43 minutes on average down to 7:53). The time spent in user space - was unchanged but the time spent in the kernel was decreased by a factor of - 2.5 (from 85 CPU seconds down to 33). -- The driver does not support short file names in general. For backwards - compatibility, we implement access to files using their short file names if - they exist. The driver will not create short file names however, and a - rename will discard any existing short file name. -- The new driver supports exporting of mounted NTFS volumes via NFS. -- The new driver supports async io (aio). -- The new driver supports fsync(2), fdatasync(2), and msync(2). -- The new driver supports readv(2) and writev(2). -- The new driver supports access time updates (including mtime and ctime). -- The new driver supports truncate(2) and open(2) with O_TRUNC. But at present - only very limited support for highly fragmented files, i.e. ones which have - their data attribute split across multiple extents, is included. Another - limitation is that at present truncate(2) will never create sparse files, - since to mark a file sparse we need to modify the directory entry for the - file and we do not implement directory modifications yet. -- The new driver supports write(2) which can both overwrite existing data and - extend the file size so that you can write beyond the existing data. Also, - writing into sparse regions is supported and the holes are filled in with - clusters. But at present only limited support for highly fragmented files, - i.e. ones which have their data attribute split across multiple extents, is - included. Another limitation is that write(2) will never create sparse - files, since to mark a file sparse we need to modify the directory entry for - the file and we do not implement directory modifications yet. - -Supported mount options -======================= - -In addition to the generic mount options described by the manual page for the -mount command (man 8 mount, also see man 5 fstab), the NTFS driver supports the -following mount options: - -======================= ======================================================= -iocharset=name Deprecated option. Still supported but please use - nls=name in the future. See description for nls=name. - -nls=name Character set to use when returning file names. - Unlike VFAT, NTFS suppresses names that contain - unconvertible characters. Note that most character - sets contain insufficient characters to represent all - possible Unicode characters that can exist on NTFS. - To be sure you are not missing any files, you are - advised to use nls=utf8 which is capable of - representing all Unicode characters. - -utf8=<bool> Option no longer supported. Currently mapped to - nls=utf8 but please use nls=utf8 in the future and - make sure utf8 is compiled either as module or into - the kernel. See description for nls=name. - -uid= -gid= -umask= Provide default owner, group, and access mode mask. - These options work as documented in mount(8). By - default, the files/directories are owned by root and - he/she has read and write permissions, as well as - browse permission for directories. No one else has any - access permissions. I.e. the mode on all files is by - default rw------- and for directories rwx------, a - consequence of the default fmask=0177 and dmask=0077. - Using a umask of zero will grant all permissions to - everyone, i.e. all files and directories will have mode - rwxrwxrwx. - -fmask= -dmask= Instead of specifying umask which applies both to - files and directories, fmask applies only to files and - dmask only to directories. - -sloppy=<BOOL> If sloppy is specified, ignore unknown mount options. - Otherwise the default behaviour is to abort mount if - any unknown options are found. - -show_sys_files=<BOOL> If show_sys_files is specified, show the system files - in directory listings. Otherwise the default behaviour - is to hide the system files. - Note that even when show_sys_files is specified, "$MFT" - will not be visible due to bugs/mis-features in glibc. - Further, note that irrespective of show_sys_files, all - files are accessible by name, i.e. you can always do - "ls -l \$UpCase" for example to specifically show the - system file containing the Unicode upcase table. - -case_sensitive=<BOOL> If case_sensitive is specified, treat all file names as - case sensitive and create file names in the POSIX - namespace. Otherwise the default behaviour is to treat - file names as case insensitive and to create file names - in the WIN32/LONG name space. Note, the Linux NTFS - driver will never create short file names and will - remove them on rename/delete of the corresponding long - file name. - Note that files remain accessible via their short file - name, if it exists. If case_sensitive, you will need - to provide the correct case of the short file name. - -disable_sparse=<BOOL> If disable_sparse is specified, creation of sparse - regions, i.e. holes, inside files is disabled for the - volume (for the duration of this mount only). By - default, creation of sparse regions is enabled, which - is consistent with the behaviour of traditional Unix - filesystems. - -errors=opt What to do when critical filesystem errors are found. - Following values can be used for "opt": - - ======== ========================================= - continue DEFAULT, try to clean-up as much as - possible, e.g. marking a corrupt inode as - bad so it is no longer accessed, and then - continue. - recover At present only supported is recovery of - the boot sector from the backup copy. - If read-only mount, the recovery is done - in memory only and not written to disk. - ======== ========================================= - - Note that the options are additive, i.e. specifying:: - - errors=continue,errors=recover - - means the driver will attempt to recover and if that - fails it will clean-up as much as possible and - continue. - -mft_zone_multiplier= Set the MFT zone multiplier for the volume (this - setting is not persistent across mounts and can be - changed from mount to mount but cannot be changed on - remount). Values of 1 to 4 are allowed, 1 being the - default. The MFT zone multiplier determines how much - space is reserved for the MFT on the volume. If all - other space is used up, then the MFT zone will be - shrunk dynamically, so this has no impact on the - amount of free space. However, it can have an impact - on performance by affecting fragmentation of the MFT. - In general use the default. If you have a lot of small - files then use a higher value. The values have the - following meaning: - - ===== ================================= - Value MFT zone size (% of volume size) - ===== ================================= - 1 12.5% - 2 25% - 3 37.5% - 4 50% - ===== ================================= - - Note this option is irrelevant for read-only mounts. -======================= ======================================================= - - -Known bugs and (mis-)features -============================= - -- The link count on each directory inode entry is set to 1, due to Linux not - supporting directory hard links. This may well confuse some user space - applications, since the directory names will have the same inode numbers. - This also speeds up ntfs_read_inode() immensely. And we haven't found any - problems with this approach so far. If you find a problem with this, please - let us know. - - -Please send bug reports/comments/feedback/abuse to the Linux-NTFS development -list at sourceforge: lin...@li... - - -Using NTFS volume and stripe sets -================================= - -For support of volume and stripe sets, you can either use the kernel's -Device-Mapper driver or the kernel's Software RAID / MD driver. The former is -the recommended one to use for linear raid. But the latter is required for -raid level 5. For striping and mirroring, either driver should work fine. - - -The Device-Mapper driver ------------------------- - -You will need to create a table of the components of the volume/stripe set and -how they fit together and load this into the kernel using the dmsetup utility -(see man 8 dmsetup). - -Linear volume sets, i.e. linear raid, has been tested and works fine. Even -though untested, there is no reason why stripe sets, i.e. raid level 0, and -mirrors, i.e. raid level 1 should not work, too. Stripes with parity, i.e. -raid level 5, unfortunately cannot work yet because the current version of the -Device-Mapper driver does not support raid level 5. You may be able to use the -Software RAID / MD driver for raid level 5, see the next section for details. - -To create the table describing your volume you will need to know each of its -components and their sizes in sectors, i.e. multiples of 512-byte blocks. - -For NT4 fault tolerant volumes you can obtain the sizes using fdisk. So for -example if one of your partitions is /dev/hda2 you would do:: - - $ fdisk -ul /dev/hda - - Disk /dev/hda: 81.9 GB, 81964302336 bytes - 255 heads, 63 sectors/track, 9964 cylinders, total 160086528 sectors - Units = sectors of 1 * 512 = 512 bytes - - Device Boot Start End Blocks Id System - /dev/hda1 * 63 4209029 2104483+ 83 Linux - /dev/hda2 4209030 37768814 16779892+ 86 NTFS - /dev/hda3 37768815 46170809 4200997+ 83 Linux - -And you would know that /dev/hda2 has a size of 37768814 - 4209030 + 1 = -33559785 sectors. - -For Win2k and later dynamic disks, you can for example use the ldminfo utility -which is part of the Linux LDM tools (the latest version at the time of -writing is linux-ldm-0.0.8.tar.bz2). You can download it from: - - http://www.linux-ntfs.org/ - -Simply extract the downloaded archive (tar xvjf linux-ldm-0.0.8.tar.bz2), go -into it (cd linux-ldm-0.0.8) and change to the test directory (cd test). You -will find the precompiled (i386) ldminfo utility there. NOTE: You will not be -able to compile this yourself easily so use the binary version! - -Then you would use ldminfo in dump mode to obtain the necessary information:: - - $ ./ldminfo --dump /dev/hda - -This would dump the LDM database found on /dev/hda which describes all of your -dynamic disks and all the volumes on them. At the bottom you will see the -VOLUME DEFINITIONS section which is all you really need. You may need to look -further above to determine which of the disks in the volume definitions is -which device in Linux. Hint: Run ldminfo on each of your dynamic disks and -look at the Disk Id close to the top of the output for each (the PRIVATE HEADER -section). You can then find these Disk Ids in the VBLK DATABASE section in the -<Disk> components where you will get the LDM Name for the disk that is found in -the VOLUME DEFINITIONS section. - -Note you will also need to enable the LDM driver in the Linux kernel. If your -distribution did not enable it, you will need to recompile the kernel with it -enabled. This will create the LDM partitions on each device at boot time. You -would then use those devices (for /dev/hda they would be /dev/hda1, 2, 3, etc) -in the Device-Mapper table. - -You can also bypass using the LDM driver by using the main device (e.g. -/dev/hda) and then using the offsets of the LDM partitions into this device as -the "Start sector of device" when creating the table. Once again ldminfo would -give you the correct information to do this. - -Assuming you know all your devices and their sizes things are easy. - -For a linear raid the table would look like this (note all values are in -512-byte sectors):: - - # Offset into Size of this Raid type Device Start sector - # volume device of device - 0 1028161 linear /dev/hda1 0 - 1028161 3903762 linear /dev/hdb2 0 - 4931923 2103211 linear /dev/hdc1 0 - -For a striped volume, i.e. raid level 0, you will need to know the chunk size -you used when creating the volume. Windows uses 64kiB as the default, so it -will probably be this unless you changes the defaults when creating the array. - -For a raid level 0 the table would look like this (note all values are in -512-byte sectors):: - - # Offset Size Raid Number Chunk 1st Start 2nd Start - # into of the type of size Device in Device in - # volume volume stripes device device - 0 2056320 striped 2 128 /dev/hda1 0 /dev/hdb1 0 - -If there are more than two devices, just add each of them to the end of the -line. - -Finally, for a mirrored volume, i.e. raid level 1, the table would look like -this (note all values are in 512-byte sectors):: - - # Ofs Size Raid Log Number Region Should Number Source Start Target Start - # in of the type type of log size sync? of Device in Device in - # vol volume params mirrors Device Device - 0 2056320 mirror core 2 16 nosync 2 /dev/hda1 0 /dev/hdb1 0 - -If you are mirroring to multiple devices you can specify further targets at the -end of the line. - -Note the "Should sync?" parameter "nosync" means that the two mirrors are -already in sync which will be the case on a clean shutdown of Windows. If the -mirrors are not clean, you can specify the "sync" option instead of "nosync" -and the Device-Mapper driver will then copy the entirety of the "Source Device" -to the "Target Device" or if you specified multiple target devices to all of -them. - -Once you have your table, save it in a file somewhere (e.g. /etc/ntfsvolume1), -and hand it over to dmsetup to work with, like so:: - - $ dmsetup create myvolume1 /etc/ntfsvolume1 - -You can obviously replace "myvolume1" with whatever name you like. - -If it all worked, you will now have the device /dev/device-mapper/myvolume1 -which you can then just use as an argument to the mount command as usual to -mount the ntfs volume. For example:: - - $ mount -t ntfs -o ro /dev/device-mapper/myvolume1 /mnt/myvol1 - -(You need to create the directory /mnt/myvol1 first and of course you can use -anything you like instead of /mnt/myvol1 as long as it is an existing -directory.) - -It is advisable to do the mount read-only to see if the volume has been setup -correctly to avoid the possibility of causing damage to the data on the ntfs -volume. - - -The Software RAID / MD driver ------------------------------ - -An alternative to using the Device-Mapper driver is to use the kernel's -Software RAID / MD driver. For which you need to set up your /etc/raidtab -appropriately (see man 5 raidtab). - -Linear volume sets, i.e. linear raid, as well as stripe sets, i.e. raid level -0, have been tested and work fine (though see section "Limitations when using -the MD driver with NTFS volumes" especially if you want to use linear raid). -Even though untested, there is no reason why mirrors, i.e. raid level 1, and -stripes with parity, i.e. raid level 5, should not work, too. - -You have to use the "persistent-superblock 0" option for each raid-disk in the -NTFS volume/stripe you are configuring in /etc/raidtab as the persistent -superblock used by the MD driver would damage the NTFS volume. - -Windows by default uses a stripe chunk size of 64k, so you probably want the -"chunk-size 64k" option for each raid-disk, too. - -For example, if you have a stripe set consisting of two partitions /dev/hda5 -and /dev/hdb1 your /etc/raidtab would look like this:: - - raiddev /dev/md0 - raid-level 0 - nr-raid-disks 2 - nr-spare-disks 0 - persistent-superblock 0 - chunk-size 64k - device /dev/hda5 - raid-disk 0 - device /dev/hdb1 - raid-disk 1 - -For linear raid, just change the raid-level above to "raid-level linear", for -mirrors, change it to "raid-level 1", and for stripe sets with parity, change -it to "raid-level 5". - -Note for stripe sets with parity you will also need to tell the MD driver -which parity algorithm to use by specifying the option "parity-algorithm -which", where you need to replace "which" with the name of the algorithm to -use (see man 5 raidtab for available algorithms) and you will have to try the -different available algorithms until you find one that works. Make sure you -are working read-only when playing with this as you may damage your data -otherwise. If you find which algorithm works please let us know (email the -linux-ntfs developers list lin...@li... or drop in on -IRC in channel #ntfs on the irc.freenode.net network) so we can update this -documentation. - -Once the raidtab is setup, run for example raid0run -a to start all devices or -raid0run /dev/md0 to start a particular md device, in this case /dev/md0. - -Then just use the mount command as usual to mount the ntfs volume using for -example:: - - mount -t ntfs -o ro /dev/md0 /mnt/myntfsvolume - -It is advisable to do the mount read-only to see if the md volume has been -setup correctly to avoid the possibility of causing damage to the data on the -ntfs volume. - - -Limitations when using the Software RAID / MD driver ------------------------------------------------------ - -Using the md driver will not work properly if any of your NTFS partitions have -an odd number of sectors. This is especially important for linear raid as all -data after the first partition with an odd number of sectors will be offset by -one or more sectors so if you mount such a partition with write support you -will cause massive damage to the data on the volume which will only become -apparent when you try to use the volume again under Windows. - -So when using linear raid, make sure that all your partitions have an even -number of sectors BEFORE attempting to use it. You have been warned! - -Even better is to simply use the Device-Mapper for linear raid and then you do -not have this problem with odd numbers of sectors. diff --git a/MAINTAINERS b/MAINTAINERS index 391bbb855cbe..9d4a1e5a8e7f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -15460,16 +15460,6 @@ W: https://github.com/davejiang/linux/wiki T: git https://github.com/davejiang/linux.git F: drivers/ntb/hw/intel/ -NTFS FILESYSTEM -M: Anton Altaparmakov <an...@tu...> -R: Namjae Jeon <lin...@ke...> -L: lin...@li... -S: Supported -W: http://www.tuxera.com/ -T: git git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs.git -F: Documentation/filesystems/ntfs.rst -F: fs/ntfs/ - NTFS3 FILESYSTEM M: Konstantin Komarov <alm...@pa...> L: nt...@li...v diff --git a/fs/Kconfig b/fs/Kconfig index a3159831ba98..96eb9d31c5a9 100644 --- a/fs/Kconfig +++ b/fs/Kconfig @@ -163,7 +163,6 @@ menu "DOS/FAT/EXFAT/NT Filesystems" source "fs/fat/Kconfig" source "fs/exfat/Kconfig" -source "fs/ntfs/Kconfig" source "fs/ntfs3/Kconfig" endmenu diff --git a/fs/Makefile b/fs/Makefile index a6962c588962..faeb0f3a1018 100644 --- a/fs/Makefile +++ b/fs/Makefile @@ -92,7 +92,6 @@ obj-y += unicode/ obj-$(CONFIG_SYSV_FS) += sysv/ obj-$(CONFIG_SMBFS) += smb/ obj-$(CONFIG_HPFS_FS) += hpfs/ -obj-$(CONFIG_NTFS_FS) += ntfs/ obj-$(CONFIG_NTFS3_FS) += ntfs3/ obj-$(CONFIG_UFS_FS) += ufs/ obj-$(CONFIG_EFS_FS) += efs/ diff --git a/fs/ntfs/Kconfig b/fs/ntfs/Kconfig deleted file mode 100644 index 7b2509741735..000000000000 --- a/fs/ntfs/Kconfig +++ /dev/null @@ -1,81 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only -config NTFS_FS - tristate "NTFS file system support" - select BUFFER_HEAD - select NLS - help - NTFS is the file system of Microsoft Windows NT, 2000, XP and 2003. - - Saying Y or M here enables read support. There is partial, but - safe, write support available. For write support you must also - say Y to "NTFS write support" below. - - There are also a number of user-space tools available, called - ntfsprogs. These include ntfsundelete and ntfsresize, that work - without NTFS support enabled in the kernel. - - This is a rewrite from scratch of Linux NTFS support and replaced - the old NTFS code starting with Linux 2.5.11. A backport to - the Linux 2.4 kernel series is separately available as a patch - from the project web site. - - For more information see <file:Documentation/filesystems/ntfs.rst> - and <http://www.linux-ntfs.org/>. - - To compile this file system support as a module, choose M here: the - module will be called ntfs. - - If you are not using Windows NT, 2000, XP or 2003 in addition to - Linux on your computer it is safe to say N. - -config NTFS_DEBUG - bool "NTFS debugging support" - depends on NTFS_FS - help - If you are experiencing any problems with the NTFS file system, say - Y here. This will result in additional consistency checks to be - performed by the driver as well as additional debugging messages to - be written to the system log. Note that debugging messages are - disabled by default. To enable them, supply the option debug_msgs=1 - at the kernel command line when booting the kernel or as an option - to insmod when loading the ntfs module. Once the driver is active, - you can enable debugging messages by doing (as root): - echo 1 > /proc/sys/fs/ntfs-debug - Replacing the "1" with "0" would disable debug messages. - - If you leave debugging messages disabled, this results in little - overhead, but enabling debug messages results in very significant - slowdown of the system. - - When reporting bugs, please try to have available a full dump of - debugging messages while the misbehaviour was occurring. - -config NTFS_RW - bool "NTFS write support" - depends on NTFS_FS - depends on PAGE_SIZE_LESS_THAN_64KB - help - This enables the partial, but safe, write support in the NTFS driver. - - The only supported operation is overwriting existing files, without - changing the file length. No file or directory creation, deletion or - renaming is possible. Note only non-resident files can be written to - so you may find that some very small files (<500 bytes or so) cannot - be written to. - - While we cannot guarantee that it will not damage any data, we have - so far not received a single report where the driver would have - damaged someones data so we assume it is perfectly safe to use. - - Note: While write support is safe in this version (a rewrite from - scratch of the NTFS support), it should be noted that the old NTFS - write support, included in Linux 2.5.10 and before (since 1997), - is not safe. - - This is currently useful with TopologiLinux. TopologiLinux is run - on top of any DOS/Microsoft Windows system without partitioning your - hard disk. Unlike other Linux distributions TopologiLinux does not - need its own partition. For more information see - <http://topologi-linux.sourceforge.net/> - - It is perfectly safe to say N here. diff --git a/fs/ntfs/Makefile b/fs/ntfs/Makefile deleted file mode 100644 index 3e736572ed00..000000000000 --- a/fs/ntfs/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# Rules for making the NTFS driver. - -obj-$(CONFIG_NTFS_FS) += ntfs.o - -ntfs-y := aops.o attrib.o collate.o compress.o debug.o dir.o file.o \ - index.o inode.o mft.o mst.o namei.o runlist.o super.o sysctl.o \ - unistr.o upcase.o - -ntfs-$(CONFIG_NTFS_RW) += bitmap.o lcnalloc.o logfile.o quota.o usnjrnl.o - -ccflags-y := -DNTFS_VERSION=\"2.1.32\" -ccflags-$(CONFIG_NTFS_DEBUG) += -DDEBUG -ccflags-$(CONFIG_NTFS_RW) += -DNTFS_RW - diff --git a/fs/ntfs/aops.c b/fs/ntfs/aops.c deleted file mode 100644 index 2d01517a2d59..000000000000 --- a/fs/ntfs/aops.c +++ /dev/null @@ -1,1744 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -/* - * aops.c - NTFS kernel address space operations and page cache handling. - * - * Copyright (c) 2001-2014 Anton Altaparmakov and Tuxera Inc. - * Copyright (c) 2002 Richard Russon - */ - -#include <linux/errno.h> -#include <linux/fs.h> -#include <linux/gfp.h> -#include <linux/mm.h> -#include <linux/pagemap.h> -#include <linux/swap.h> -#include <linux/buffer_head.h> -#include <linux/writeback.h> -#include <linux/bit_spinlock.h> -#include <linux/bio.h> - -#include "aops.h" -#include "attrib.h" -#include "debug.h" -#include "inode.h" -#include "mft.h" -#include "runlist.h" -#include "types.h" -#include "ntfs.h" - -/** - * ntfs_end_buffer_async_read - async io completion for reading attributes - * @bh: buffer head on which io is completed - * @uptodate: whether @bh is now uptodate or not - * - * Asynchronous I/O completion handler for reading pages belonging to the - * attribute address space of an inode. The inodes can either be files or - * directories or they can be fake inodes describing some attribute. - * - * If NInoMstProtected(), perform the post read mst fixups when all IO on the - * page has been completed and mark the page uptodate or set the error bit on - * the page. To determine the size of the records that need fixing up, we - * cheat a little bit by setting the index_block_size in ntfs_inode to the ntfs - * record size, and index_block_size_bits, to the log(base 2) of the ntfs - * record size. - */ -static void ntfs_end_buffer_async_read(struct buffer_head *bh, int uptodate) -{ - unsigned long flags; - struct buffer_head *first, *tmp; - struct page *page; - struct inode *vi; - ntfs_inode *ni; - int page_uptodate = 1; - - page = bh->b_page; - vi = page->mapping->host; - ni = NTFS_I(vi); - - if (likely(uptodate)) { - loff_t i_size; - s64 file_ofs, init_size; - - set_buffer_uptodate(bh); - - file_ofs = ((s64)page->index << PAGE_SHIFT) + - bh_offset(bh); - read_lock_irqsave(&ni->size_lock, flags); - init_size = ni->initialized_size; - i_size = i_size_read(vi); - read_unlock_irqrestore(&ni->size_lock, flags); - if (unlikely(init_size > i_size)) { - /* Race with shrinking truncate. */ - init_size = i_size; - } - /* Check for the current buffer head overflowing. */ - if (unlikely(file_ofs + bh->b_size > init_size)) { - int ofs; - void *kaddr; - - ofs = 0; - if (file_ofs < init_size) - ofs = init_size - file_ofs; - kaddr = kmap_atomic(page); - memset(kaddr + bh_offset(bh) + ofs, 0, - bh->b_size - ofs); - flush_dcache_page(page); - kunmap_atomic(kaddr); - } - } else { - clear_buffer_uptodate(bh); - SetPageError(page); - ntfs_error(ni->vol->sb, "Buffer I/O error, logical block " - "0x%llx.", (unsigned long long)bh->b_blocknr); - } - first = page_buffers(page); - spin_lock_irqsave(&first->b_uptodate_lock, flags); - clear_buffer_async_read(bh); - unlock_buffer(bh); - tmp = bh; - do { - if (!buffer_uptodate(tmp)) - page_uptodate = 0; - if (buffer_async_read(tmp)) { - if (likely(buffer_locked(tmp))) - goto still_busy; - /* Async buffers must be locked. */ - BUG(); - } - tmp = tmp->b_this_page; - } while (tmp != bh); - spin_unlock_irqrestore(&first->b_uptodate_lock, flags); - /* - * If none of the buffers had errors then we can set the page uptodate, - * but we first have to perform the post read mst fixups, if the - * attribute is mst protected, i.e. if NInoMstProteced(ni) is true. - * Note we ignore fixup errors as those are detected when - * map_mft_record() is called which gives us per record granularity - * rather than per page granularity. - */ - if (!NInoMstProtected(ni)) { - if (likely(page_uptodate && !PageError(page))) - SetPageUptodate(page); - } else { - u8 *kaddr; - unsigned int i, recs; - u32 rec_size; - - rec_size = ni->itype.index.block_size; - recs = PAGE_SIZE / rec_size; - /* Should have been verified before we got here... */ - BUG_ON(!recs); - kaddr = kmap_atomic(page); - for (i = 0; i < recs; i++) - post_read_mst_fixup((NTFS_RECORD*)(kaddr + - i * rec_size), rec_size); - kunmap_atomic(kaddr); - flush_dcache_page(page); - if (likely(page_uptodate && !PageError(page))) - SetPageUptodate(page); - } - unlock_page(page); - return; -still_busy: - spin_unlock_irqrestore(&first->b_uptodate_lock, flags); - return; -} - -/** - * ntfs_read_block - fill a @folio of an address space with data - * @folio: page cache folio to fill with data - * - * We read each buffer asynchronously and when all buffers are read in, our io - * completion handler ntfs_end_buffer_read_async(), if required, automatically - * applies the mst fixups to the folio before finally marking it uptodate and - * unlocking it. - * - * We only enforce allocated_size limit because i_size is checked for in - * generic_file_read(). - * - * Return 0 on success and -errno on error. - * - * Contains an adapted version of fs/buffer.c::block_read_full_folio(). - */ -static int ntfs_read_block(struct folio *folio) -{ - loff_t i_size; - VCN vcn; - LCN lcn; - s64 init_size; - struct inode *vi; - ntfs_inode *ni; - ntfs_volume *vol; - runlist_element *rl; - struct buffer_head *bh, *head, *arr[MAX_BUF_PER_PAGE]; - sector_t iblock, lblock, zblock; - unsigned long flags; - unsigned int blocksize, vcn_ofs; - int i, nr; - unsigned char blocksize_bits; - - vi = folio->mapping->host; - ni = NTFS_I(vi); - vol = ni->vol; - - /* $MFT/$DATA must have its complete runlist in memory at all times. */ - BUG_ON(!ni->runlist.rl && !ni->mft_no && !NInoAttr(ni)); - - blocksize = vol->sb->s_blocksize; - blocksize_bits = vol->sb->s_blocksize_bits; - - head = folio_buffers(folio); - if (!head) - head = create_empty_buffers(folio, blocksize, 0); - bh = head; - - /* - * We may be racing with truncate. To avoid some of the problems we - * now take a snapshot of the various sizes and use those for the whole - * of the function. In case of an extending truncate it just means we - * may leave some buffers unmapped which are now allocated. This is - * not a problem since these buffers will just get mapped when a write - * occurs. In case of a shrinking truncate, we will detect this later - * on due to the runlist being incomplete and if the folio is being - * fully truncated, truncate will throw it away as soon as we unlock - * it so no need to worry what we do with it. - */ - iblock = (s64)folio->index << (PAGE_SHIFT - blocksize_bits); - read_lock_irqsave(&ni->size_lock, flags); - lblock = (ni->allocated_size + blocksize - 1) >> blocksize_bits; - init_size = ni->initialized_size; - i_size = i_size_read(vi); - read_unlock_irqrestore(&ni->size_lock, flags); - if (unlikely(init_size > i_size)) { - /* Race with shrinking truncate. */ - init_size = i_size; - } - zblock = (init_size + blocksize - 1) >> blocksize_bits; - - /* Loop through all the buffers in the folio. */ - rl = NULL; - nr = i = 0; - do { - int err = 0; - - if (unlikely(buffer_uptodate(bh))) - continue; - if (unlikely(buffer_mapped(bh))) { - arr[nr++] = bh; - continue; - } - bh->b_bdev = vol->sb->s_bdev; - /* Is the block within the allowed limits? */ - if (iblock < lblock) { - bool is_retry = false; - - /* Convert iblock into corresponding vcn and offset. */ - vcn = (VCN)iblock << blocksize_bits >> - vol->cluster_size_bits; - vcn_ofs = ((VCN)iblock << blocksize_bits) & - vol->cluster_size_mask; - if (!rl) { -lock_retry_remap: - down_read(&ni->runlist.lock); - rl = ni->runlist.rl; - } - if (likely(rl != NULL)) { - /* Seek to element containing target vcn. */ - while (rl->length && rl[1].vcn <= vcn) - rl++; - lcn = ntfs_rl_vcn_to_lcn(rl, vcn); - } else - lcn = LCN_RL_NOT_MAPPED; - /* Successful remap. */ - if (lcn >= 0) { - /* Setup buffer head to correct block. */ - bh->b_blocknr = ((lcn << vol->cluster_size_bits) - + vcn_ofs) >> blocksize_bits; - set_buffer_mapped(bh); - /* Only read initialized data blocks. */ - if (iblock < zblock) { - arr[nr++] = bh; - continue; - } - /* Fully non-initialized data block, zero it. */ - goto handle_zblock; - } - /* It is a hole, need to zero it. */ - if (lcn == LCN_HOLE) - goto handle_hole; - /* If first try and runlist unmapped, map and retry. */ - if (!is_retry && lcn == LCN_RL_NOT_MAPPED) { - is_retry = true; - /* - * Attempt to map runlist, dropping lock for - * the duration. - */ - up_read(&ni->runlist.lock); - err = ntfs_map_runlist(ni, vcn); - if (likely(!err)) - goto lock_retry_remap; - rl = NULL; - } else if (!rl) - up_read(&ni->runlist.lock); - /* - * If buffer is outside the runlist, treat it as a - * hole. This can happen due to concurrent truncate - * for example. - */ - if (err == -ENOENT || lcn == LCN_ENOENT) { - err = 0; - goto handle_hole; - } - /* Hard error, zero out region. */ - if (!err) - err = -EIO; - bh->b_blocknr = -1; - folio_set_error(folio); - ntfs_error(vol->sb, "Failed to read from inode 0x%lx, " - "attribute type 0x%x, vcn 0x%llx, " - "offset 0x%x because its location on " - "disk could not be determined%s " - "(error code %i).", ni->mft_no, - ni->type, (unsigned long long)vcn, - vcn_ofs, is_retry ? " even after " - "retrying" : "", err); - } - /* - * Either iblock was outside lblock limits or - * ntfs_rl_vcn_to_lcn() returned error. Just zero that portion - * of the folio and set the buffer uptodate. - */ -handle_hole: - bh->b_blocknr = -1UL; - clear_buffer_mapped(bh); -handle_zblock: - folio_zero_range(folio, i * blocksize, blocksize); - if (likely(!err)) - set_buffer_uptodate(bh); - } while (i++, iblock++, (bh = bh->b_this_page) != head); - - /* Release the lock if we took it. */ - if (rl) - up_read(&ni->runlist.lock); - - /* Check we have at least one buffer ready for i/o. */ - if (nr) { - struct buffer_head *tbh; - - /* Lock the buffers. */ - for (i = 0; i < nr; i++) { - tbh = arr[i]; - lock_buffer(tbh); - tbh->b_end_io = ntfs_end_buffer_async_read; - set_buffer_async_read(tbh); - } - /* Finally, start i/o on the buffers. */ - for (i = 0; i < nr; i++) { - tbh = arr[i]; - if (likely(!buffer_uptodate(tbh))) - submit_bh(REQ_OP_READ, tbh); - else - ntfs_end_buffer_async_read(tbh, 1); - } - return 0; - } - /* No i/o was scheduled on any of the buffers. */ - if (likely(!folio_test_error(folio))) - folio_mark_uptodate(folio); - else /* Signal synchronous i/o error. */ - nr = -EIO; - folio_unlock(folio); - return nr; -} - -/** - * ntfs_read_folio - fill a @folio of a @file with data from the device - * @file: open file to which the folio @folio belongs or NULL - * @folio: page cache folio to fill with data - * - * For non-resident attributes, ntfs_read_folio() fills the @folio of the open - * file @file by calling the ntfs version of the generic block_read_full_folio() - * function, ntfs_read_block(), which in turn creates and reads in the buffers - * associated with the folio asynchronously. - * - * For resident attributes, OTOH, ntfs_read_folio() fills @folio by copying the - * data from the mft record (which at this stage is most likely in memory) and - * fills the remainder with zeroes. Thus, in this case, I/O is synchronous, as - * even if the mft record is not cached at this point in time, we need to wait - * for it to be read in before we can do the copy. - * - * Return 0 on success and -errno on error. - */ -static int ntfs_read_folio(struct file *file, struct folio *folio) -{ - struct page *page = &folio->page; - loff_t i_size; - struct inode *vi; - ntfs_inode *ni, *base_ni; - u8 *addr; - ntfs_attr_search_ctx *ctx; - MFT_RECORD *mrec; - unsigned long flags; - u32 attr_len; - int err = 0; - -retry_readpage: - BUG_ON(!PageLocked(page)); - vi = page->mapping->host; - i_size = i_size_read(vi); - /* Is the page fully outside i_size? (truncate in progress) */ - if (unlikely(page->index >= (i_size + PAGE_SIZE - 1) >> - PAGE_SHIFT)) { - zero_user(page, 0, PAGE_SIZE); - ntfs_debug("Read outside i_size - truncated?"); - goto done; - } - /* - * This can potentially happen because we clear PageUptodate() during - * ntfs_writepage() of MstProtected() attributes. - */ - if (PageUptodate(page)) { - unlock_page(page); - return 0; - } - ni = NTFS_I(vi); - /* - * Only $DATA attributes can be encrypted and only unnamed $DATA - * attributes can be compressed. Index root can have the flags set but - * this means to create compressed/encrypted files, not that the - * attribute is compressed/encrypted. Note we need to check for - * AT_INDEX_ALLOCATION since this is the type of both directory and - * index inodes. - */ - if (ni->type != AT_INDEX_ALLOCATION) { - /* If attribute is encrypted, deny access, just like NT4. */ - if (NInoEncrypted(ni)) { - BUG_ON(ni->type != AT_DATA); - err = -EACCES; - goto err_out; - } - /* Compressed data streams are handled in compress.c. */ - if (NInoNonResident(ni) && NInoCompressed(ni)) { - BUG_ON(ni->type != AT_DATA); - BUG_ON(ni->name_len); - return ntfs_read_compressed_block(page); - } - } - /* NInoNonResident() == NInoIndexAllocPresent() */ - if (NInoNonResident(ni)) { - /* Normal, non-resident data stream. */ - return ntfs_read_block(folio); - } - /* - * Attribute is resident, implying it is not compressed or encrypted. - * This also means the attribute is smaller than an mft record and - * hence smaller than a page, so can simply zero out any pages with - * index above 0. Note the attribute can actually be marked compressed - * but if it is resident the actual data is not compressed so we are - * ok to ignore the compressed flag here. - */ - if (unlikely(page->index > 0)) { - zero_user(page, 0, PAGE_SIZE); - goto done; - } - if (!NInoAttr(ni)) - base_ni = ni; - else - base_ni = ni->ext.base_ntfs_ino; - /* Map, pin, and lock the mft record. */ - mrec = map_mft_record(base_ni); - if (IS_ERR(mrec)) { - err = PTR_ERR(mrec); - goto err_out; - } - /* - * If a parallel write made the attribute non-resident, drop the mft - * record and retry the read_folio. - */ - if (unlikely(NInoNonResident(ni))) { - unmap_mft_record(base_ni); - goto retry_readpage; - } - ctx = ntfs_attr_get_search_ctx(base_ni, mrec); - if (unlikely(!ctx)) { - err = -ENOMEM; - goto unm_err_out; - } - err = ntfs_attr_lookup(ni->type, ni->name, ni->name_len, - CASE_SENSITIVE, 0, NULL, 0, ctx); - if (unlikely(err)) - goto put_unm_err_out; - attr_len = le32_to_cpu(ctx->attr->data.resident.value_length); - read_lock_irqsave(&ni->size_lock, flags); - if (unlikely(attr_len > ni->initialized_size)) - attr_len = ni->initialized_size; - i_size = i_size_read(vi); - read_unlock_irqrestore(&ni->size_lock, flags); - if (unlikely(attr_len > i_size)) { - /* Race with shrinking truncate. */ - attr_len = i_size; - } - addr = kmap_atomic(page); - /* Copy the data to the page. */ - memcpy(addr, (u8*)ctx->attr + - le16_to_cpu(ctx->attr->data.resident.value_offset), - attr_len); - /* Zero the remainder of the page. */ - memset(addr + attr_len, 0, PAGE_SIZE - attr_len); - flush_dcache_page(page); - kunmap_atomic(addr); -put_unm_err_out: - ntfs_attr_put_search_ctx(ctx); -unm_err_out: - unmap_mft_record(base_ni); -done: - SetPageUptodate(page); -err_out: - unlock_page(page); - return err; -} - -#ifdef NTFS_RW - -/** - * ntfs_write_block - write a @folio to the backing store - * @folio: page cache folio to write out - * @wbc: writeback control structure - * - * This function is for writing folios belonging to non-resident, non-mst - * protected attributes to their backing store. - * - * For a folio with buffers, map and write the dirty buffers asynchronously - * under folio writeback. For a folio without buffers, create buffers for the - * folio, then proceed as above. - * - * If a folio doesn't have buffers the folio dirty state is definitive. If - * a folio does have buffers, the folio dirty state is just a hint, - * and the buffer dirty state is definitive. (A hint which has rules: - * dirty buffers against a clean folio is illegal. Other combinations are - * legal and need to be handled. In particular a dirty folio containing - * clean buffers for example.) - * - * Return 0 on success and -errno on error. - * - * Based on ntfs_read_block() and __block_write_full_folio(). - */ -static int ntfs_write_block(struct folio *folio, struct writeback_control *wbc) -{ - VCN vcn; - LCN lcn; - s64 initialized_size; - loff_t i_size; - sector_t block, dblock, iblock; - struct inode *vi; - ntfs_inode *ni; - ntfs_volume *vol; - runlist_element *rl; - struct buffer_head *bh, *head; - unsigned long flags; - unsigned int blocksize, vcn_ofs; - int err; - bool need_end_writeback; - unsigned char blocksize_bits; - - vi = folio->mapping->host; - ni = NTFS_I(vi); - vol = ni->vol; - - ntfs_debug("Entering for inode 0x%lx, attribute type 0x%x, page index " - "0x%lx.", ni->mft_no, ni->type, folio->index); - - BUG_ON(!NInoNonResident(ni)); - BUG_ON(NInoMstProtected(ni)); - blocksize = vol->sb->s_blocksize; - blocksize_bits = vol->sb->s_blocksize_bits; - head = folio_buffers(folio); - if (!head) { - BUG_ON(!folio_test_uptodate(folio)); - head = create_empty_buffers(folio, blocksize, - (1 << BH_Uptodate) | (1 << BH_Dirty)); - } - bh = head; - - /* NOTE: Different naming scheme to ntfs_read_block()! */ - - /* The first block in the folio. */ - block = (s64)folio->index << (PAGE_SHIFT - blocksize_bits); - - read_lock_irqsave(&ni->size_lock, flags); - i_size = i_size_read(vi); - initialized_size = ni->initialized_size; - read_unlock_irqrestore(&ni->size_lock, flags); - - /* The first out of bounds block for the data size. */ - dblock = (i_size + blocksize - 1) >> blocksize_bits; - - /* The last (fully or partially) initialized block. */ - iblock = initialized_size >> blocksize_bits; - - /* - * Be very careful. We have no exclusion from block_dirty_folio - * here, and the (potentially unmapped) buffers may become dirty at - * any time. If a buffer becomes dirty here after we've inspected it - * then we just miss that fact, and the folio stays dirty. - * - * Buffers outside i_size may be dirtied by block_dirty_folio; - * handle that here by just cleaning them. - */ - - /* - * Loop through all the buffers in the folio, mapping all the dirty - * buffers to disk addresses and handling any aliases from the - * underlying block device's mapping. - */ - rl = NULL; - err = 0; - do { - bool is_retry = false; - - if (unlikely(block >= dblock)) { - /* - * Mapped buffers outside i_size will occur, because - * this folio can be outside i_size when there is a - * truncate in progress. The contents of such buffers - * were zeroed by ntfs_writepage(). - * - * FIXME: What about the small race window where - * ntfs_writepage() has not done any clearing because - * the folio was within i_size but before we get here, - * vmtruncate() modifies i_size? - */ - clear_buffer_dirty(bh); - set_buffer_uptodate(bh); - continue; - } - - /* Clean buffers are not written out, so no need to map them. */ - if (!buffer_dirty(bh)) - continue; - - /* Make sure we have enough initialized size. */ - if (unlikely((block >= iblock) && - (initialized_size < i_size))) { - /* - * If this folio is fully outside initialized - * size, zero out all folios between the current - * initialized size and the current folio. Just - * use ntfs_read_folio() to do the zeroing - * transparently. - */ - if (block > iblock) { - // TODO: - // For each folio do: - // - read_cache_folio() - // Again for each folio do: - // - wait_on_folio_locked() - // - Check (folio_test_uptodate(folio) && - // !folio_test_error(folio)) - // Update initialized size in the attribute and - // in the inode. - // Again, for each folio do: - // block_dirty_folio(); - // folio_put() - // We don't need to wait on the writes. - // Update iblock. - } - /* - * The current folio straddles initialized size. Zero - * all non-uptodate buffers and set them uptodate (and - * dirty?). Note, there aren't any non-uptodate buffers - * if the folio is uptodate. - * FIXME: For an uptodate folio, the buffers may need to - * be written out because they were not initialized on - * disk before. - */ - if (!folio_test_uptodate(folio)) { - // TODO: - // Zero any non-uptodate buffers up to i_size. - // Set them uptodate and dirty. - } - // TODO: - // Update initialized size in the attribute and in the - // inode (up to i_size). - // Update iblock. - // FIXME: This is inefficient. Try to batch the two - // size changes to happen in one go. - ntfs_error(vol->sb, "Writing beyond initialized size " - "is not supported yet. Sorry."); - err = -EOPNOTSUPP; - break; - // Do NOT set_buffer_new() BUT DO clear buffer range - // outside write request range. - // set_buffer_uptodate() on complete buffers as well as - // set_buffer_dirty(). - } - - /* No need to map buffers that are already mapped. */ - if (buffer_mapped(bh)) - continue; - - /* Unmapped, dirty buffer. Need to map it. */ - bh->b_bdev = vol->sb->s_bdev; - - /* Convert block into corresponding vcn and offset. */ - vcn = (VCN)block << blocksize_bits; - vcn_ofs = vcn & vol->cluster_size_mask; - vcn >>= vol->cluster_size_bits; - if (!rl) { -lock_retry_remap: - down_read(&ni->runlist.lock); - rl = ni->runlist.rl; - } - if (likely(rl != NULL)) { - /* Seek to element containing target vcn. */ - while (rl->length && rl[1].vcn <= vcn) - rl++; - lcn = ntfs_rl_vcn_to_lcn(rl, vcn); - } else - lcn = LCN_RL_NOT_MAPPED; - /* Successful remap. */ - if (lcn >= 0) { - /* Setup buffer head to point to correct block. */ - bh->b_blocknr = ((lcn << vol->cluster_size_bits) + - vcn_ofs) >> blocksize_bits; - set_buffer_mapped(bh); - continue; - } - /* It is a hole, need to instantiate it. */ - if (lcn == LCN_HOLE) { - u8 *kaddr; - unsigned long *bpos, *bend; - - /* Check if the buffer is zero. */ - kaddr = kmap_local_folio(folio, bh_offset(bh)); - bpos = (unsigned long *)kaddr; - bend = (unsigned long *)(kaddr + blocksize); - do { - if (unlikely(*bpos)) - break; - } while (likely(++bpos < bend)); - kunmap_local(kaddr); - if (bpos == bend) { - /* - * Buffer is zero and sparse, no need to write - * it. - */ - bh->b_blocknr = -1; - clear_buffer_dirty(bh); - continue; - } - // TODO: Instantiate the hole. - // clear_buffer_new(bh); - // clean_bdev_bh_alias(bh); - ntfs_error(vol->sb, "Writing into sparse regions is " - "not supported yet. Sorry."); - err = -EOPNOTSUPP; - break; - } - /* If first try and runlist unmapped, map and retry. */ - if (!is_retry && lcn == LCN_RL_NOT_MAPPED) { - is_retry = true; - /* - * Attempt to map runlist, dropping lock for - * the duration. - */ - up_read(&ni->runlist.lock); - err = ntfs_map_runlist(ni, vcn); - if (likely(!err)) - goto lock_retry_remap; - rl = NULL; - } else if (!rl) - up_read(&ni->runlist.lock); - /* - * If buffer is outside the runlist, truncate has cut it out - * of the runlist. Just clean and clear the buffer and set it - * uptodate so it can get discarded by the VM. - */ - if (err == -ENOENT || lcn == LCN_ENOENT) { - bh->b_blocknr = -1; - clear_buffer_dirty(bh); - folio_zero_range(folio, bh_offset(bh), blocksize); - set_buffer_uptodate(bh); - err = 0; - continue; - } - /* Failed to map the buffer, even after retrying. */ - if (!err) - err = -EIO; - bh->b_blocknr = -1; - ntfs_error(vol->sb, "Failed to write to inode 0x%lx, " - "attribute type 0x%x, vcn 0x%llx, offset 0x%x " - "because its location on disk could not be " - "determined%s (error code %i).", ni->mft_no, - ni->type, (unsigned long long)vcn, - vcn_ofs, is_retry ? " even after " - "retrying" : "", err); - break; - } while (block++, (bh = bh->b_this_page) != head); - - /* Release the lock if we took it. */ - if (rl) - up_read(&ni->runlist.lock); - - /* For the error case, need to reset bh to the beginning. */ - bh = head; - - /* Just an optimization, so ->read_folio() is not called later. */ - if (unlikely(!folio_test_uptodate(folio))) { - int uptodate = 1; - do { - if (!buffer_uptodate(bh)) { - uptodate = 0; - bh = head; - break; - } - } while ((bh = bh->b_this_page) != head); - if (uptodate) - folio_mark_uptodate(folio); - } - - /* Setup all mapped, dirty buffers for async write i/o. */ - do { - if (buffer_mapped(bh) && buffer_dirty(bh)) { - lock_buffer(bh); - if (test_clear_buffer_dirty(bh)) { - BUG_ON(!buffer_uptodate(bh)); - mark_buffer_async_write(bh); - } else - unlock_buffer(bh); - } else if (unlikely(err)) { - /* - * For the error case. The buffer may have been set - * dirty during attachment to a dirty folio. - */ - if (err != -ENOMEM) - clear_buffer_dirty(bh); - } - } while ((bh = bh->b_this_page) != head); - - if (unlikely(err)) { - // TODO: Remove the -EOPNOTSUPP check later on... - if (unlikely(err == -EOPNOTSUPP)) - err = 0; - else if (err == -ENOMEM) { - ntfs_warning(vol->sb, "Error allocating memory. " - "Redirtying folio so we try again " - "later."); - /* - * Put the folio back on mapping->dirty_pages, but - * leave its buffer's dirty state as-is. - */ - folio_redirty_for_writepage(wbc, folio); - err = 0; - } else - folio_set_error(folio); - } - - BUG_ON(folio_test_writeback(folio)); - folio_start_writeback(folio); /* Keeps try_to_free_buffers() away. */ - - /* Submit the prepared buffers for i/o. */ - need_end_writeback = true; - do { - struct buffer_head *next = bh->b_this_page; - if (buffer_async_write(bh)) { - submit_bh(REQ_OP_WRITE, bh); - need_end_writeback = false; - } - bh = next; - } while (bh != head); - folio_unlock(folio); - - /* If no i/o was started, need to end writeback here. */ - if (unlikely(need_end_writeback)) - folio_end_writeback(folio); - - ntfs_debug("Done."); - return err; -} - -/** - * ntfs_write_mst_block - write a @page to the backing store - * @page: page cache page to write out - * @wbc: writeback control structure - * - * This function is for writing pages belonging to non-resident, mst protected - * attributes to their backing store. The only supported attributes are index - * allocation and $MFT/$DATA. Both directory inodes and index inodes are - * supported for the index allocation case. - * - * The page must remain locked for the duration of the write because we apply - * the mst fixups, write, and then undo the fixups, so if we were to unlock the - * page before undoing the fixups, any other user of the page will see the - * page contents as corrupt. - * - * We clear the page uptodate flag for the duration of the function to ensure - * exclusion for the $MFT/$DATA case against someone mapping an mft record we - * are about to apply the mst fixups to. - * - * Return 0 on success and -errno on error. - * - * Based on ntfs_write_block(), ntfs_mft_writepage(), and - * write_mft_record_nolock(). - */ -static int ntfs_write_mst_block(struct page *page, - struct writeback_control *wbc) -{ - sector_t block, dblock, rec_block; - struct inode *vi = page->mapping->host; - ntfs_inode *ni = NTFS_I(vi); - ntfs_volume *vol = ni->vol; - u8 *kaddr; - unsigned int rec_size = ni->itype.index.block_size; - ntfs_inode *locked_nis[PAGE_SIZE / NTFS_BLOCK_SIZE]; - struct buffer_head *bh, *head, *tbh, *rec_start_bh; - struct buffer_head *bhs[MAX_BUF_PER_PAGE]; - runlist_element *rl; - int i, nr_locked_nis, nr_recs, nr_bhs, max_bhs, bhs_per_rec, err, err2; - unsigned bh_size, rec_size_bits; - bool sync, is_mft, page_is_dirty, rec_is_dirty; - unsigned char bh_size_bits; - - if (WARN_ON(rec_size < NTFS_BLOCK_SIZE)) - return -EINVAL; - - ntfs_debug("Entering for inode 0x%lx, attribute type 0x%x, page index " - "0x%lx.", vi->i_ino, ni->type, page->index); - BUG_ON(!NInoNonResident(ni)); - BUG_ON(!NInoMstProtected(ni)); - is_mft = (S_ISREG(vi->i_mode) && !vi->i_ino); - /* - * NOTE: ntfs_write_mst_block() would be called for $MFTMirr if a page - * in its page cache were to be marked dirty. However this should - * never happen with the current driver and considering we do not - * handle this case here we do want to BUG(), at least for now. ... [truncated message content] |
|
From: syzbot <syz...@sy...> - 2024-01-09 20:01:46
|
Hello, syzbot found the following issue on: HEAD commit: 1f874787ed9a Merge tag 'net-6.7-rc9' of git://git.kernel.o.. git tree: upstream console output: https://syzkaller.appspot.com/x/log.txt?x=14e62f89e80000 kernel config: https://syzkaller.appspot.com/x/.config?x=655f8abe9fe69b3b dashboard link: https://syzkaller.appspot.com/bug?extid=79de0e28cb0a65ee635e compiler: Debian clang version 15.0.6, GNU ld (GNU Binutils for Debian) 2.40 Unfortunately, I don't have any reproducer for this issue yet. Downloadable assets: disk image: https://storage.googleapis.com/syzbot-assets/323bf803118f/disk-1f874787.raw.xz vmlinux: https://storage.googleapis.com/syzbot-assets/f4354a1804a9/vmlinux-1f874787.xz kernel image: https://storage.googleapis.com/syzbot-assets/0bf2547383ed/bzImage-1f874787.xz IMPORTANT: if you fix the issue, please add the following tag to the commit: Reported-by: syz...@sy... ntfs: volume version 3.1. ================================================================== BUG: KASAN: slab-use-after-free in instrument_atomic_read include/linux/instrumented.h:68 [inline] BUG: KASAN: slab-use-after-free in _test_bit include/asm-generic/bitops/instrumented-non-atomic.h:141 [inline] BUG: KASAN: slab-use-after-free in NInoAttr fs/ntfs/inode.h:200 [inline] BUG: KASAN: slab-use-after-free in ntfs_test_inode+0x7f/0x2e0 fs/ntfs/inode.c:55 Read of size 8 at addr ffff888082831fe0 by task syz-executor.3/6682 CPU: 1 PID: 6682 Comm: syz-executor.3 Not tainted 6.7.0-rc8-syzkaller-00119-g1f874787ed9a #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 11/17/2023 Call Trace: <TASK> __dump_stack lib/dump_stack.c:88 [inline] dump_stack_lvl+0x1e7/0x2d0 lib/dump_stack.c:106 print_address_description mm/kasan/report.c:364 [inline] print_report+0x163/0x540 mm/kasan/report.c:475 kasan_report+0x142/0x170 mm/kasan/report.c:588 kasan_check_range+0x27e/0x290 mm/kasan/generic.c:187 instrument_atomic_read include/linux/instrumented.h:68 [inline] _test_bit include/asm-generic/bitops/instrumented-non-atomic.h:141 [inline] NInoAttr fs/ntfs/inode.h:200 [inline] ntfs_test_inode+0x7f/0x2e0 fs/ntfs/inode.c:55 find_inode+0x16f/0x430 fs/inode.c:903 ilookup5_nowait fs/inode.c:1458 [inline] ilookup5+0xa1/0x200 fs/inode.c:1487 iget5_locked+0x37/0x270 fs/inode.c:1268 ntfs_iget+0xc4/0x190 fs/ntfs/inode.c:168 load_and_check_logfile+0x3f/0xd0 fs/ntfs/super.c:1216 load_system_files+0x32fb/0x4840 fs/ntfs/super.c:1949 ntfs_fill_super+0x19b3/0x2bd0 fs/ntfs/super.c:2900 mount_bdev+0x237/0x300 fs/super.c:1650 legacy_get_tree+0xef/0x190 fs/fs_context.c:662 vfs_get_tree+0x8c/0x2a0 fs/super.c:1771 do_new_mount+0x28f/0xae0 fs/namespace.c:3337 do_mount fs/namespace.c:3677 [inline] __do_sys_mount fs/namespace.c:3886 [inline] __se_sys_mount+0x2d9/0x3c0 fs/namespace.c:3863 do_syscall_x64 arch/x86/entry/common.c:52 [inline] do_syscall_64+0x45/0x110 arch/x86/entry/common.c:83 entry_SYSCALL_64_after_hwframe+0x63/0x6b RIP: 0033:0x7f19f747e3ea Code: d8 64 89 02 48 c7 c0 ff ff ff ff eb a6 e8 de 09 00 00 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 40 00 49 89 ca b8 a5 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 b0 ff ff ff f7 d8 64 89 01 48 RSP: 002b:00007f19f8119ee8 EFLAGS: 00000202 ORIG_RAX: 00000000000000a5 RAX: ffffffffffffffda RBX: 00007f19f8119f80 RCX: 00007f19f747e3ea RDX: 0000000020000000 RSI: 0000000020000040 RDI: 00007f19f8119f40 RBP: 0000000020000000 R08: 00007f19f8119f80 R09: 0000000000800804 R10: 0000000000800804 R11: 0000000000000202 R12: 0000000020000040 R13: 00007f19f8119f40 R14: 000000000001ee6e R15: 0000000020002380 </TASK> Allocated by task 25333: kasan_save_stack mm/kasan/common.c:45 [inline] kasan_set_track+0x4f/0x70 mm/kasan/common.c:52 __kasan_slab_alloc+0x66/0x70 mm/kasan/common.c:328 kasan_slab_alloc include/linux/kasan.h:188 [inline] slab_post_alloc_hook+0x6c/0x3c0 mm/slab.h:763 slab_alloc_node mm/slub.c:3478 [inline] slab_alloc mm/slub.c:3486 [inline] __kmem_cache_alloc_lru mm/slub.c:3493 [inline] kmem_cache_alloc_lru+0x108/0x240 mm/slub.c:3509 alloc_inode_sb include/linux/fs.h:2937 [inline] reiserfs_alloc_inode+0x2a/0xc0 fs/reiserfs/super.c:642 alloc_inode fs/inode.c:261 [inline] new_inode_pseudo+0x65/0x1d0 fs/inode.c:1006 new_inode+0x22/0x1d0 fs/inode.c:1032 reiserfs_mkdir+0x1c0/0x8f0 fs/reiserfs/namei.c:813 xattr_mkdir fs/reiserfs/xattr.c:77 [inline] create_privroot fs/reiserfs/xattr.c:891 [inline] reiserfs_xattr_init+0x355/0x6c0 fs/reiserfs/xattr.c:1007 reiserfs_fill_super+0x2207/0x2620 fs/reiserfs/super.c:2175 mount_bdev+0x237/0x300 fs/super.c:1650 legacy_get_tree+0xef/0x190 fs/fs_context.c:662 vfs_get_tree+0x8c/0x2a0 fs/super.c:1771 do_new_mount+0x28f/0xae0 fs/namespace.c:3337 do_mount fs/namespace.c:3677 [inline] __do_sys_mount fs/namespace.c:3886 [inline] __se_sys_mount+0x2d9/0x3c0 fs/namespace.c:3863 do_syscall_x64 arch/x86/entry/common.c:52 [inline] do_syscall_64+0x45/0x110 arch/x86/entry/common.c:83 entry_SYSCALL_64_after_hwframe+0x63/0x6b Last potentially related work creation: kasan_save_stack+0x3f/0x60 mm/kasan/common.c:45 __kasan_record_aux_stack+0xad/0xc0 mm/kasan/generic.c:492 __call_rcu_common kernel/rcu/tree.c:2681 [inline] call_rcu+0x167/0xa80 kernel/rcu/tree.c:2795 dispose_list fs/inode.c:699 [inline] evict_inodes+0x5f8/0x690 fs/inode.c:749 generic_shutdown_super+0x9d/0x2c0 fs/super.c:675 kill_block_super+0x44/0x90 fs/super.c:1667 deactivate_locked_super+0xc1/0x130 fs/super.c:484 cleanup_mnt+0x426/0x4c0 fs/namespace.c:1256 task_work_run+0x24a/0x300 kernel/task_work.c:180 resume_user_mode_work include/linux/resume_user_mode.h:49 [inline] exit_to_user_mode_loop+0xde/0x100 kernel/entry/common.c:171 exit_to_user_mode_prepare+0xb1/0x150 kernel/entry/common.c:204 __syscall_exit_to_user_mode_work kernel/entry/common.c:285 [inline] syscall_exit_to_user_mode+0x69/0x2a0 kernel/entry/common.c:296 do_syscall_64+0x52/0x110 arch/x86/entry/common.c:89 entry_SYSCALL_64_after_hwframe+0x63/0x6b Second to last potentially related work creation: kasan_save_stack+0x3f/0x60 mm/kasan/common.c:45 __kasan_record_aux_stack+0xad/0xc0 mm/kasan/generic.c:492 __call_rcu_common kernel/rcu/tree.c:2681 [inline] call_rcu+0x167/0xa80 kernel/rcu/tree.c:2795 reiserfs_fill_super+0x1572/0x2620 fs/reiserfs/super.c:2078 mount_bdev+0x237/0x300 fs/super.c:1650 legacy_get_tree+0xef/0x190 fs/fs_context.c:662 vfs_get_tree+0x8c/0x2a0 fs/super.c:1771 do_new_mount+0x28f/0xae0 fs/namespace.c:3337 do_mount fs/namespace.c:3677 [inline] __do_sys_mount fs/namespace.c:3886 [inline] __se_sys_mount+0x2d9/0x3c0 fs/namespace.c:3863 do_syscall_x64 arch/x86/entry/common.c:52 [inline] do_syscall_64+0x45/0x110 arch/x86/entry/common.c:83 entry_SYSCALL_64_after_hwframe+0x63/0x6b The buggy address belongs to the object at ffff888082831a80 which belongs to the cache reiser_inode_cache of size 1568 The buggy address is located 1376 bytes inside of freed 1568-byte region [ffff888082831a80, ffff8880828320a0) The buggy address belongs to the physical page: page:ffffea00020a0c00 refcount:1 mapcount:0 mapping:0000000000000000 index:0xffff8880828348e0 pfn:0x82830 head:ffffea00020a0c00 order:3 entire_mapcount:0 nr_pages_mapped:0 pincount:0 memcg:ffff888021ae9b01 flags: 0xfff00000000840(slab|head|node=0|zone=1|lastcpupid=0x7ff) page_type: 0xffffffff() raw: 00fff00000000840 ffff88814229d500 ffffea0000f11200 0000000000000002 raw: ffff8880828348e0 0000000080130004 00000001ffffffff ffff888021ae9b01 page dumped because: kasan: bad access detected page_owner tracks the page as allocated page last allocated via order 3, migratetype Reclaimable, gfp_mask 0x1d20d0(__GFP_IO|__GFP_FS|__GFP_NOWARN|__GFP_NORETRY|__GFP_COMP|__GFP_NOMEMALLOC|__GFP_HARDWALL|__GFP_RECLAIMABLE), pid 10321, tgid 10319 (syz-executor.4), ts 465005937020, free_ts 222502828644 set_page_owner include/linux/page_owner.h:31 [inline] post_alloc_hook+0x1e6/0x210 mm/page_alloc.c:1537 prep_new_page mm/page_alloc.c:1544 [inline] get_page_from_freelist+0x33ea/0x3570 mm/page_alloc.c:3312 __alloc_pages+0x255/0x680 mm/page_alloc.c:4568 alloc_pages_mpol+0x3de/0x640 mm/mempolicy.c:2133 alloc_slab_page+0x6a/0x170 mm/slub.c:1870 allocate_slab mm/slub.c:2017 [inline] new_slab+0x84/0x2f0 mm/slub.c:2070 ___slab_alloc+0xc8a/0x1330 mm/slub.c:3223 __slab_alloc mm/slub.c:3322 [inline] __slab_alloc_node mm/slub.c:3375 [inline] slab_alloc_node mm/slub.c:3468 [inline] slab_alloc mm/slub.c:3486 [inline] __kmem_cache_alloc_lru mm/slub.c:3493 [inline] kmem_cache_alloc_lru+0x18e/0x240 mm/slub.c:3509 alloc_inode_sb include/linux/fs.h:2937 [inline] reiserfs_alloc_inode+0x2a/0xc0 fs/reiserfs/super.c:642 alloc_inode fs/inode.c:261 [inline] new_inode_pseudo+0x65/0x1d0 fs/inode.c:1006 new_inode+0x22/0x1d0 fs/inode.c:1032 reiserfs_create+0x182/0x6e0 fs/reiserfs/namei.c:641 lookup_open fs/namei.c:3477 [inline] open_last_lookups fs/namei.c:3546 [inline] path_openat+0x13fa/0x3290 fs/namei.c:3776 do_filp_open+0x234/0x490 fs/namei.c:3809 do_sys_openat2+0x13e/0x1d0 fs/open.c:1437 do_sys_open fs/open.c:1452 [inline] __do_sys_openat fs/open.c:1468 [inline] __se_sys_openat fs/open.c:1463 [inline] __x64_sys_openat+0x247/0x290 fs/open.c:1463 page last free stack trace: reset_page_owner include/linux/page_owner.h:24 [inline] free_pages_prepare mm/page_alloc.c:1137 [inline] free_unref_page_prepare+0x931/0xa60 mm/page_alloc.c:2347 free_unref_page_list+0x5a0/0x840 mm/page_alloc.c:2533 release_pages+0x2117/0x2400 mm/swap.c:1042 tlb_batch_pages_flush mm/mmu_gather.c:98 [inline] tlb_flush_mmu_free mm/mmu_gather.c:293 [inline] tlb_flush_mmu+0x34c/0x4e0 mm/mmu_gather.c:300 tlb_finish_mmu+0xd4/0x1f0 mm/mmu_gather.c:392 unmap_region+0x300/0x350 mm/mmap.c:2341 do_vmi_align_munmap+0x1223/0x1860 mm/mmap.c:2657 do_vmi_munmap+0x24d/0x2d0 mm/mmap.c:2725 __vm_munmap+0x230/0x450 mm/mmap.c:3012 __do_sys_munmap mm/mmap.c:3029 [inline] __se_sys_munmap mm/mmap.c:3026 [inline] __x64_sys_munmap+0x69/0x80 mm/mmap.c:3026 do_syscall_x64 arch/x86/entry/common.c:52 [inline] do_syscall_64+0x45/0x110 arch/x86/entry/common.c:83 entry_SYSCALL_64_after_hwframe+0x63/0x6b Memory state around the buggy address: ffff888082831e80: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb ffff888082831f00: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb >ffff888082831f80: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb ^ ffff888082832000: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb ffff888082832080: fb fb fb fb fc fc fc fc fc fc fc fc fc fc fc fc ================================================================== --- This report is generated by a bot. It may contain errors. See https://goo.gl/tpsmEJ for more information about syzbot. syzbot engineers can be reached at syz...@go.... syzbot will keep track of this issue. See: https://goo.gl/tpsmEJ#status for how to communicate with syzbot. If the report is already addressed, let syzbot know by replying with: #syz fix: exact-commit-title If you want to overwrite report's subsystems, reply with: #syz set subsystems: new-subsystem (See the list of subsystem names on the web dashboard) If the report is a duplicate of another one, reply with: #syz dup: exact-subject-of-another-report If you want to undo deduplication, reply with: #syz undup |
|
From: syzbot <syz...@sy...> - 2024-01-09 18:20:44
|
Hello ntfs maintainers/developers, This is a 31-day syzbot report for the ntfs subsystem. All related reports/information can be found at: https://syzkaller.appspot.com/upstream/s/ntfs During the period, 1 new issues were detected and 0 were fixed. In total, 26 issues are still open and 8 have been fixed so far. Some of the still happening issues: Ref Crashes Repro Title <1> 5250 Yes possible deadlock in ntfs_read_folio https://syzkaller.appspot.com/bug?extid=8ef76b0b1f86c382ad37 <2> 3663 Yes kernel BUG at fs/ntfs/aops.c:LINE! https://syzkaller.appspot.com/bug?extid=6a5a7672f663cce8b156 <3> 1828 Yes kernel BUG in __ntfs_grab_cache_pages https://syzkaller.appspot.com/bug?extid=01b3ade7c86f7dd584d7 <4> 814 Yes possible deadlock in map_mft_record https://syzkaller.appspot.com/bug?extid=cb1fdea540b46f0ce394 <5> 436 Yes KASAN: slab-out-of-bounds Read in ntfs_readdir https://syzkaller.appspot.com/bug?extid=d36761079ac1b585a6df <6> 324 No possible deadlock in __ntfs_clear_inode https://syzkaller.appspot.com/bug?extid=5ebb8d0e9b8c47867596 <7> 112 Yes KMSAN: uninit-value in post_read_mst_fixup (2) https://syzkaller.appspot.com/bug?extid=82248056430fd49210e9 <8> 72 Yes kernel BUG in ntfs_iget https://syzkaller.appspot.com/bug?extid=d62e6bd2a2d05103d105 <9> 41 Yes kernel BUG in ntfs_lookup_inode_by_name https://syzkaller.appspot.com/bug?extid=d532380eef771ac0034b <10> 19 Yes KASAN: use-after-free Read in ntfs_attr_find (2) https://syzkaller.appspot.com/bug?extid=ef50f8eb00b54feb7ba2 --- This report is generated by a bot. It may contain errors. See https://goo.gl/tpsmEJ for more information about syzbot. syzbot engineers can be reached at syz...@go.... To disable reminders for individual bugs, reply with the following command: #syz set <Ref> no-reminders To change bug's subsystems, reply with: #syz set <Ref> subsystems: new-subsystem You may send multiple commands in a single email message. |
|
From: syzbot <syz...@sy...> - 2024-01-09 18:19:42
|
Hello, syzbot found the following issue on: HEAD commit: aafe7ad77b91 Merge branch 'for-next/core' into for-kernelci git tree: git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git for-kernelci console output: https://syzkaller.appspot.com/x/log.txt?x=154cf661e80000 kernel config: https://syzkaller.appspot.com/x/.config?x=23ce86eb3d78ef4d dashboard link: https://syzkaller.appspot.com/bug?extid=f583da5774d7dd400312 compiler: Debian clang version 15.0.6, GNU ld (GNU Binutils for Debian) 2.40 userspace arch: arm64 syz repro: https://syzkaller.appspot.com/x/repro.syz?x=149ca405e80000 C reproducer: https://syzkaller.appspot.com/x/repro.c?x=12172d89e80000 Downloadable assets: disk image: https://storage.googleapis.com/syzbot-assets/23845238c49b/disk-aafe7ad7.raw.xz vmlinux: https://storage.googleapis.com/syzbot-assets/1144b0f74104/vmlinux-aafe7ad7.xz kernel image: https://storage.googleapis.com/syzbot-assets/6db20df213a2/Image-aafe7ad7.gz.xz mounted in repro: https://storage.googleapis.com/syzbot-assets/475f587fffbd/mount_0.gz IMPORTANT: if you fix the issue, please add the following tag to the commit: Reported-by: syz...@sy... ntfs: (device loop0): parse_options(): Option utf8 is no longer supported, using option nls=utf8. Please use option nls=utf8 in the future and make sure utf8 is compiled either as a module or into the kernel. ntfs: volume version 3.1. ================================================================== BUG: KASAN: use-after-free in ntfs_commit_pages_after_write fs/ntfs/file.c:1597 [inline] BUG: KASAN: use-after-free in ntfs_perform_write+0x5354/0x82c8 fs/ntfs/file.c:1853 Write of size 1 at addr ffff0000de9b6170 by task syz-executor306/6098 CPU: 0 PID: 6098 Comm: syz-executor306 Not tainted 6.7.0-rc6-syzkaller-gaafe7ad77b91 #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 11/10/2023 Call trace: dump_backtrace+0x1b8/0x1e4 arch/arm64/kernel/stacktrace.c:291 show_stack+0x2c/0x3c arch/arm64/kernel/stacktrace.c:298 __dump_stack lib/dump_stack.c:88 [inline] dump_stack_lvl+0xd0/0x124 lib/dump_stack.c:106 print_address_description mm/kasan/report.c:364 [inline] print_report+0x174/0x514 mm/kasan/report.c:475 kasan_report+0xd8/0x138 mm/kasan/report.c:588 kasan_check_range+0x254/0x294 mm/kasan/generic.c:187 __asan_memcpy+0x54/0x84 mm/kasan/shadow.c:106 ntfs_commit_pages_after_write fs/ntfs/file.c:1597 [inline] ntfs_perform_write+0x5354/0x82c8 fs/ntfs/file.c:1853 ntfs_file_write_iter+0xf3c/0x1738 fs/ntfs/file.c:1909 call_write_iter include/linux/fs.h:2020 [inline] new_sync_write fs/read_write.c:491 [inline] vfs_write+0x610/0x910 fs/read_write.c:584 ksys_write+0x15c/0x26c fs/read_write.c:637 __do_sys_write fs/read_write.c:649 [inline] __se_sys_write fs/read_write.c:646 [inline] __arm64_sys_write+0x7c/0x90 fs/read_write.c:646 __invoke_syscall arch/arm64/kernel/syscall.c:37 [inline] invoke_syscall+0x98/0x2b8 arch/arm64/kernel/syscall.c:51 el0_svc_common+0x130/0x23c arch/arm64/kernel/syscall.c:136 do_el0_svc+0x48/0x58 arch/arm64/kernel/syscall.c:155 el0_svc+0x54/0x158 arch/arm64/kernel/entry-common.c:678 el0t_64_sync_handler+0x84/0xfc arch/arm64/kernel/entry-common.c:696 el0t_64_sync+0x190/0x194 arch/arm64/kernel/entry.S:595 The buggy address belongs to the physical page: page:000000003d2e8ed5 refcount:0 mapcount:0 mapping:0000000000000000 index:0x1 pfn:0x11e9b6 flags: 0x5ffc00000000000(node=0|zone=2|lastcpupid=0x7ff) page_type: 0xffffffff() raw: 05ffc00000000000 fffffc00037a6dc8 fffffc00037a6d48 0000000000000000 raw: 0000000000000001 0000000000000000 00000000ffffffff 0000000000000000 page dumped because: kasan: bad access detected Memory state around the buggy address: ffff0000de9b6000: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ffff0000de9b6080: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff >ffff0000de9b6100: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ^ ffff0000de9b6180: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ffff0000de9b6200: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ================================================================== --- This report is generated by a bot. It may contain errors. See https://goo.gl/tpsmEJ for more information about syzbot. syzbot engineers can be reached at syz...@go.... syzbot will keep track of this issue. See: https://goo.gl/tpsmEJ#status for how to communicate with syzbot. If the report is already addressed, let syzbot know by replying with: #syz fix: exact-commit-title If you want syzbot to run the reproducer, reply with: #syz test: git://repo/address.git branch-or-commit-hash If you attach or paste a git patch, syzbot will apply it before testing. If you want to overwrite report's subsystems, reply with: #syz set subsystems: new-subsystem (See the list of subsystem names on the web dashboard) If the report is a duplicate of another one, reply with: #syz dup: exact-subject-of-another-report If you want to undo deduplication, reply with: #syz undup |
|
From: syzbot <syz...@sy...> - 2023-12-27 12:12:36
|
syzbot has found a reproducer for the following issue on: HEAD commit: fbafc3e621c3 Merge tag 'for_linus' of git://git.kernel.org.. git tree: upstream console+strace: https://syzkaller.appspot.com/x/log.txt?x=170a9f76e80000 kernel config: https://syzkaller.appspot.com/x/.config?x=e0c7078a6b901aa3 dashboard link: https://syzkaller.appspot.com/bug?extid=82248056430fd49210e9 compiler: Debian clang version 15.0.6, GNU ld (GNU Binutils for Debian) 2.40 syz repro: https://syzkaller.appspot.com/x/repro.syz?x=173c705ee80000 C reproducer: https://syzkaller.appspot.com/x/repro.c?x=1410147ee80000 Downloadable assets: disk image: https://storage.googleapis.com/syzbot-assets/1520f7b6daa4/disk-fbafc3e6.raw.xz vmlinux: https://storage.googleapis.com/syzbot-assets/8b490af009d5/vmlinux-fbafc3e6.xz kernel image: https://storage.googleapis.com/syzbot-assets/202ca200f4a4/bzImage-fbafc3e6.xz mounted in repro: https://storage.googleapis.com/syzbot-assets/a03c45c57d87/mount_0.gz IMPORTANT: if you fix the issue, please add the following tag to the commit: Reported-by: syz...@sy... ntfs: (device loop0): ntfs_read_locked_inode(): Failed with error code -2. Marking corrupt inode 0xa as bad. Run chkdsk. ntfs: (device loop0): load_and_init_upcase(): Failed to load $UpCase from the volume. Using default. ntfs: volume version 3.1. ntfs: (device loop0): ntfs_mapping_pairs_decompress(): Corrupt attribute. syz-executor416: attempt to access beyond end of device loop0: rw=0, sector=552, nr_sectors = 8 limit=190 ===================================================== BUG: KMSAN: uninit-value in post_read_mst_fixup+0xab8/0xb70 fs/ntfs/mst.c:39 post_read_mst_fixup+0xab8/0xb70 fs/ntfs/mst.c:39 ntfs_end_buffer_async_read+0xbb8/0x1a70 fs/ntfs/aops.c:133 end_bio_bh_io_sync+0x130/0x1d0 fs/buffer.c:2775 bio_endio+0xb17/0xb70 block/bio.c:1603 submit_bio_noacct+0x230/0x2840 block/blk-core.c:816 submit_bio+0x171/0x1c0 block/blk-core.c:842 submit_bh_wbc+0x7de/0x850 fs/buffer.c:2821 submit_bh+0x26/0x30 fs/buffer.c:2826 ntfs_read_block fs/ntfs/aops.c:339 [inline] ntfs_read_folio+0x364b/0x3930 fs/ntfs/aops.c:430 filemap_read_folio+0xce/0x370 mm/filemap.c:2323 do_read_cache_folio+0x3b4/0x11e0 mm/filemap.c:3691 do_read_cache_page mm/filemap.c:3757 [inline] read_cache_page+0x63/0x1c0 mm/filemap.c:3766 read_mapping_page include/linux/pagemap.h:871 [inline] ntfs_map_page fs/ntfs/aops.h:75 [inline] ntfs_lookup_inode_by_name+0x1d97/0x50d0 fs/ntfs/dir.c:308 check_windows_hibernation_status+0xc4/0xca0 fs/ntfs/super.c:1282 load_system_files+0x6d84/0x97b0 fs/ntfs/super.c:1997 ntfs_fill_super+0x307e/0x45d0 fs/ntfs/super.c:2900 mount_bdev+0x3d7/0x560 fs/super.c:1650 ntfs_mount+0x4d/0x60 fs/ntfs/super.c:3057 legacy_get_tree+0x110/0x290 fs/fs_context.c:662 vfs_get_tree+0xa5/0x520 fs/super.c:1771 do_new_mount+0x68d/0x1550 fs/namespace.c:3337 path_mount+0x73d/0x1f20 fs/namespace.c:3664 do_mount fs/namespace.c:3677 [inline] __do_sys_mount fs/namespace.c:3886 [inline] __se_sys_mount+0x725/0x810 fs/namespace.c:3863 __x64_sys_mount+0xe4/0x140 fs/namespace.c:3863 do_syscall_x64 arch/x86/entry/common.c:52 [inline] do_syscall_64+0x44/0x110 arch/x86/entry/common.c:83 entry_SYSCALL_64_after_hwframe+0x63/0x6b Uninit was created at: __alloc_pages+0x9a4/0xe00 mm/page_alloc.c:4591 alloc_pages_mpol+0x62b/0x9d0 mm/mempolicy.c:2133 alloc_pages mm/mempolicy.c:2204 [inline] folio_alloc+0x1da/0x380 mm/mempolicy.c:2211 filemap_alloc_folio+0xa5/0x430 mm/filemap.c:974 do_read_cache_folio+0x163/0x11e0 mm/filemap.c:3655 do_read_cache_page mm/filemap.c:3757 [inline] read_cache_page+0x63/0x1c0 mm/filemap.c:3766 read_mapping_page include/linux/pagemap.h:871 [inline] ntfs_map_page fs/ntfs/aops.h:75 [inline] ntfs_lookup_inode_by_name+0x1d97/0x50d0 fs/ntfs/dir.c:308 check_windows_hibernation_status+0xc4/0xca0 fs/ntfs/super.c:1282 load_system_files+0x6d84/0x97b0 fs/ntfs/super.c:1997 ntfs_fill_super+0x307e/0x45d0 fs/ntfs/super.c:2900 mount_bdev+0x3d7/0x560 fs/super.c:1650 ntfs_mount+0x4d/0x60 fs/ntfs/super.c:3057 legacy_get_tree+0x110/0x290 fs/fs_context.c:662 vfs_get_tree+0xa5/0x520 fs/super.c:1771 do_new_mount+0x68d/0x1550 fs/namespace.c:3337 path_mount+0x73d/0x1f20 fs/namespace.c:3664 do_mount fs/namespace.c:3677 [inline] __do_sys_mount fs/namespace.c:3886 [inline] __se_sys_mount+0x725/0x810 fs/namespace.c:3863 __x64_sys_mount+0xe4/0x140 fs/namespace.c:3863 do_syscall_x64 arch/x86/entry/common.c:52 [inline] do_syscall_64+0x44/0x110 arch/x86/entry/common.c:83 entry_SYSCALL_64_after_hwframe+0x63/0x6b CPU: 1 PID: 5006 Comm: syz-executor416 Not tainted 6.7.0-rc7-syzkaller-00003-gfbafc3e621c3 #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 11/17/2023 ===================================================== --- If you want syzbot to run the reproducer, reply with: #syz test: git://repo/address.git branch-or-commit-hash If you attach or paste a git patch, syzbot will apply it before testing. |
|
From: syzbot <syz...@sy...> - 2023-12-26 15:59:33
|
Hello, syzbot found the following issue on: HEAD commit: 55cb5f43689d Merge tag 'trace-v6.7-rc6' of git://git.kerne.. git tree: upstream console output: https://syzkaller.appspot.com/x/log.txt?x=107247e1e80000 kernel config: https://syzkaller.appspot.com/x/.config?x=4a65fa9f077ead01 dashboard link: https://syzkaller.appspot.com/bug?extid=82248056430fd49210e9 compiler: Debian clang version 15.0.6, GNU ld (GNU Binutils for Debian) 2.40 Unfortunately, I don't have any reproducer for this issue yet. Downloadable assets: disk image: https://storage.googleapis.com/syzbot-assets/ab88d88fa1d1/disk-55cb5f43.raw.xz vmlinux: https://storage.googleapis.com/syzbot-assets/587fd1186192/vmlinux-55cb5f43.xz kernel image: https://storage.googleapis.com/syzbot-assets/c7bbb5741191/bzImage-55cb5f43.xz IMPORTANT: if you fix the issue, please add the following tag to the commit: Reported-by: syz...@sy... syz-executor.1: attempt to access beyond end of device loop1: rw=0, sector=2040, nr_sectors = 8 limit=190 ntfs: (device loop1): ntfs_end_buffer_async_read(): Buffer I/O error, logical block 0xff. ===================================================== BUG: KMSAN: uninit-value in post_read_mst_fixup+0xab8/0xb70 fs/ntfs/mst.c:39 post_read_mst_fixup+0xab8/0xb70 fs/ntfs/mst.c:39 ntfs_end_buffer_async_read+0xbb8/0x1a70 fs/ntfs/aops.c:133 end_bio_bh_io_sync+0x130/0x1d0 fs/buffer.c:2775 bio_endio+0xb17/0xb70 block/bio.c:1603 submit_bio_noacct+0x230/0x2840 block/blk-core.c:816 submit_bio+0x171/0x1c0 block/blk-core.c:842 submit_bh_wbc+0x7de/0x850 fs/buffer.c:2821 submit_bh+0x26/0x30 fs/buffer.c:2826 ntfs_read_block fs/ntfs/aops.c:339 [inline] ntfs_read_folio+0x364b/0x3930 fs/ntfs/aops.c:430 filemap_read_folio+0xce/0x370 mm/filemap.c:2323 do_read_cache_folio+0x3b4/0x11e0 mm/filemap.c:3691 do_read_cache_page mm/filemap.c:3757 [inline] read_cache_page+0x63/0x1c0 mm/filemap.c:3766 read_mapping_page include/linux/pagemap.h:871 [inline] ntfs_map_page fs/ntfs/aops.h:75 [inline] check_mft_mirror fs/ntfs/super.c:1117 [inline] load_system_files+0x985/0x97b0 fs/ntfs/super.c:1780 ntfs_fill_super+0x307e/0x45d0 fs/ntfs/super.c:2900 mount_bdev+0x3d7/0x560 fs/super.c:1650 ntfs_mount+0x4d/0x60 fs/ntfs/super.c:3057 legacy_get_tree+0x110/0x290 fs/fs_context.c:662 vfs_get_tree+0xa5/0x520 fs/super.c:1771 do_new_mount+0x68d/0x1550 fs/namespace.c:3337 path_mount+0x73d/0x1f20 fs/namespace.c:3664 do_mount fs/namespace.c:3677 [inline] __do_sys_mount fs/namespace.c:3886 [inline] __se_sys_mount+0x725/0x810 fs/namespace.c:3863 __x64_sys_mount+0xe4/0x140 fs/namespace.c:3863 do_syscall_x64 arch/x86/entry/common.c:52 [inline] do_syscall_64+0x44/0x110 arch/x86/entry/common.c:83 entry_SYSCALL_64_after_hwframe+0x63/0x6b Uninit was created at: __alloc_pages+0x9a4/0xe00 mm/page_alloc.c:4591 alloc_pages_mpol+0x62b/0x9d0 mm/mempolicy.c:2133 alloc_pages mm/mempolicy.c:2204 [inline] folio_alloc+0x1da/0x380 mm/mempolicy.c:2211 filemap_alloc_folio+0xa5/0x430 mm/filemap.c:974 do_read_cache_folio+0x163/0x11e0 mm/filemap.c:3655 do_read_cache_page mm/filemap.c:3757 [inline] read_cache_page+0x63/0x1c0 mm/filemap.c:3766 read_mapping_page include/linux/pagemap.h:871 [inline] ntfs_map_page fs/ntfs/aops.h:75 [inline] check_mft_mirror fs/ntfs/super.c:1117 [inline] load_system_files+0x985/0x97b0 fs/ntfs/super.c:1780 ntfs_fill_super+0x307e/0x45d0 fs/ntfs/super.c:2900 mount_bdev+0x3d7/0x560 fs/super.c:1650 ntfs_mount+0x4d/0x60 fs/ntfs/super.c:3057 legacy_get_tree+0x110/0x290 fs/fs_context.c:662 vfs_get_tree+0xa5/0x520 fs/super.c:1771 do_new_mount+0x68d/0x1550 fs/namespace.c:3337 path_mount+0x73d/0x1f20 fs/namespace.c:3664 do_mount fs/namespace.c:3677 [inline] __do_sys_mount fs/namespace.c:3886 [inline] __se_sys_mount+0x725/0x810 fs/namespace.c:3863 __x64_sys_mount+0xe4/0x140 fs/namespace.c:3863 do_syscall_x64 arch/x86/entry/common.c:52 [inline] do_syscall_64+0x44/0x110 arch/x86/entry/common.c:83 entry_SYSCALL_64_after_hwframe+0x63/0x6b CPU: 0 PID: 6133 Comm: syz-executor.1 Not tainted 6.7.0-rc6-syzkaller-00022-g55cb5f43689d #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 11/17/2023 ===================================================== --- This report is generated by a bot. It may contain errors. See https://goo.gl/tpsmEJ for more information about syzbot. syzbot engineers can be reached at syz...@go.... syzbot will keep track of this issue. See: https://goo.gl/tpsmEJ#status for how to communicate with syzbot. If the report is already addressed, let syzbot know by replying with: #syz fix: exact-commit-title If you want to overwrite report's subsystems, reply with: #syz set subsystems: new-subsystem (See the list of subsystem names on the web dashboard) If the report is a duplicate of another one, reply with: #syz dup: exact-subject-of-another-report If you want to undo deduplication, reply with: #syz undup |
|
From: Christian B. <br...@ke...> - 2023-12-19 13:07:23
|
On Mon, 18 Dec 2023 20:54:14 -0800, Randy Dunlap wrote: > Correct the kernel-doc function parameter warnings for function > ntfs_dir_fsync() to prevent the following kernel-doc warnings: > > dir.c:1489: warning: Function parameter or member 'start' not described in 'ntfs_dir_fsync' > dir.c:1489: warning: Function parameter or member 'end' not described in 'ntfs_dir_fsync' > dir.c:1489: warning: Excess function parameter 'dentry' description in 'ntfs_dir_fsync' > > [...] Applied to the vfs.misc branch of the vfs/vfs.git tree. Patches in the vfs.misc branch should appear in linux-next soon. Please report any outstanding bugs that were missed during review in a new review to the original patch series allowing us to drop it. It's encouraged to provide Acked-bys and Reviewed-bys even though the patch has now been applied. If possible patch trailers will be updated. Note that commit hashes shown below are subject to change due to rebase, trailer updates or similar. If in doubt, please check the listed branch. tree: https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git branch: vfs.misc [1/1] ntfs: dir.c: fix kernel-doc function parameter warnings https://git.kernel.org/vfs/vfs/c/be4887a964e2 |
|
From: Namjae J. <lin...@ke...> - 2023-12-19 07:45:40
|
2023-12-19 13:54 GMT+09:00, Randy Dunlap <rd...@in...>: > Correct the kernel-doc function parameter warnings for function > ntfs_dir_fsync() to prevent the following kernel-doc warnings: > > dir.c:1489: warning: Function parameter or member 'start' not described in > 'ntfs_dir_fsync' > dir.c:1489: warning: Function parameter or member 'end' not described in > 'ntfs_dir_fsync' > dir.c:1489: warning: Excess function parameter 'dentry' description in > 'ntfs_dir_fsync' > > Signed-off-by: Randy Dunlap <rd...@in...> > Cc: Anton Altaparmakov <an...@tu...> > Cc: Namjae Jeon <lin...@ke...> > Cc: lin...@li... > Cc: Andrew Morton <ak...@li...> As you may already know, the same warning is probably coming from ntfs_file_fsync() in file.c. Reviewed-by: Namjae Jeon <lin...@ke...> Thanks! > --- > fs/ntfs/dir.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff -- a/fs/ntfs/dir.c b/fs/ntfs/dir.c > --- a/fs/ntfs/dir.c > +++ b/fs/ntfs/dir.c > @@ -1462,7 +1462,8 @@ static int ntfs_dir_open(struct inode *v > /** > * ntfs_dir_fsync - sync a directory to disk > * @filp: directory to be synced > - * @dentry: dentry describing the directory to sync > + * @start: offset in bytes of the beginning of data range to sync > + * @end: offset in bytes of the end of data range (inclusive) > * @datasync: if non-zero only flush user data and not metadata > * > * Data integrity sync of a directory to disk. Used for fsync, fdatasync, > and > |
|
From: Randy D. <rd...@in...> - 2023-12-19 04:54:28
|
Correct the kernel-doc function parameter warnings for function ntfs_dir_fsync() to prevent the following kernel-doc warnings: dir.c:1489: warning: Function parameter or member 'start' not described in 'ntfs_dir_fsync' dir.c:1489: warning: Function parameter or member 'end' not described in 'ntfs_dir_fsync' dir.c:1489: warning: Excess function parameter 'dentry' description in 'ntfs_dir_fsync' Signed-off-by: Randy Dunlap <rd...@in...> Cc: Anton Altaparmakov <an...@tu...> Cc: Namjae Jeon <lin...@ke...> Cc: lin...@li... Cc: Andrew Morton <ak...@li...> --- fs/ntfs/dir.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff -- a/fs/ntfs/dir.c b/fs/ntfs/dir.c --- a/fs/ntfs/dir.c +++ b/fs/ntfs/dir.c @@ -1462,7 +1462,8 @@ static int ntfs_dir_open(struct inode *v /** * ntfs_dir_fsync - sync a directory to disk * @filp: directory to be synced - * @dentry: dentry describing the directory to sync + * @start: offset in bytes of the beginning of data range to sync + * @end: offset in bytes of the end of data range (inclusive) * @datasync: if non-zero only flush user data and not metadata * * Data integrity sync of a directory to disk. Used for fsync, fdatasync, and |
|
From: syzbot <syz...@sy...> - 2023-12-06 10:13:32
|
Hello ntfs maintainers/developers, This is a 31-day syzbot report for the ntfs subsystem. All related reports/information can be found at: https://syzkaller.appspot.com/upstream/s/ntfs During the period, 0 new issues were detected and 0 were fixed. In total, 25 issues are still open and 8 have been fixed so far. Some of the still happening issues: Ref Crashes Repro Title <1> 4839 Yes possible deadlock in ntfs_read_folio https://syzkaller.appspot.com/bug?extid=8ef76b0b1f86c382ad37 <2> 3503 Yes kernel BUG at fs/ntfs/aops.c:LINE! https://syzkaller.appspot.com/bug?extid=6a5a7672f663cce8b156 <3> 1691 Yes kernel BUG in __ntfs_grab_cache_pages https://syzkaller.appspot.com/bug?extid=01b3ade7c86f7dd584d7 <4> 763 Yes possible deadlock in map_mft_record https://syzkaller.appspot.com/bug?extid=cb1fdea540b46f0ce394 <5> 416 Yes KASAN: slab-out-of-bounds Read in ntfs_readdir https://syzkaller.appspot.com/bug?extid=d36761079ac1b585a6df <6> 312 Yes kernel BUG at fs/inode.c:LINE! (2) https://syzkaller.appspot.com/bug?extid=c92c93d1f1aaaacdb9db <7> 290 No possible deadlock in __ntfs_clear_inode https://syzkaller.appspot.com/bug?extid=5ebb8d0e9b8c47867596 <8> 55 Yes kernel BUG in ntfs_iget https://syzkaller.appspot.com/bug?extid=d62e6bd2a2d05103d105 <9> 39 Yes kernel BUG in ntfs_lookup_inode_by_name https://syzkaller.appspot.com/bug?extid=d532380eef771ac0034b <10> 19 Yes KASAN: use-after-free Read in ntfs_attr_find (2) https://syzkaller.appspot.com/bug?extid=ef50f8eb00b54feb7ba2 --- This report is generated by a bot. It may contain errors. See https://goo.gl/tpsmEJ for more information about syzbot. syzbot engineers can be reached at syz...@go.... To disable reminders for individual bugs, reply with the following command: #syz set <Ref> no-reminders To change bug's subsystems, reply with: #syz set <Ref> subsystems: new-subsystem You may send multiple commands in a single email message. |
|
From: Luis C. <mc...@ke...> - 2023-12-05 07:27:25
|
On Wed, Nov 22, 2023 at 03:00:29PM +0100, Christian Brauner wrote: > Looks fine, > Acked-by: Christian Brauner <br...@ke...> Series applied, thanks! Luis |
|
From: Christian B. <br...@ke...> - 2023-11-22 14:00:49
|
Looks fine, Acked-by: Christian Brauner <br...@ke...> |
|
From: Joel G. v. B4 R. <dev...@ke...> - 2023-11-21 11:35:51
|
From: Joel Granados <j.g...@sa...> This commit comes at the tail end of a greater effort to remove the empty elements at the end of the ctl_table arrays (sentinels) which will reduce the overall build time size of the kernel and run time memory bloat by ~64 bytes per sentinel (further information Link : https://lore.kernel.org/all/ZO5Yx5JFogGi%2F...@bo.../) Remove empty sentinel element from test_table and test_table_unregister. Signed-off-by: Joel Granados <j.g...@sa...> --- lib/test_sysctl.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/test_sysctl.c b/lib/test_sysctl.c index 8036aa91a1cb..9d71ec5e8a77 100644 --- a/lib/test_sysctl.c +++ b/lib/test_sysctl.c @@ -130,7 +130,6 @@ static struct ctl_table test_table[] = { .mode = 0644, .proc_handler = proc_do_large_bitmap, }, - { } }; static void test_sysctl_calc_match_int_ok(void) @@ -184,7 +183,6 @@ static struct ctl_table test_table_unregister[] = { .mode = 0644, .proc_handler = proc_dointvec_minmax, }, - {} }; static int test_sysctl_run_unregister_nested(void) -- 2.30.2 |
|
From: Joel G. v. B4 R. <dev...@ke...> - 2023-11-21 11:35:51
|
From: Joel Granados <j.g...@sa...> What? These commits remove the sentinel element (last empty element) from the sysctl arrays of all the files under the "fs/" directory that use a sysctl array for registration. The merging of the preparation patches (in https://lore.kernel.org/all/ZO5Yx5JFogGi%2F...@bo.../) to mainline allows us to just remove sentinel elements without changing behavior (more info here [1]). These commits are part of a bigger set (here https://github.com/Joelgranados/linux/tree/tag/sysctl_remove_empty_elem_V5) that remove the ctl_table sentinel. We make the review process easier by chunking the commits into manageable pieces. Each chunk can be reviewed separately without noise from parallel sets. Sending the "fs/*" chunk now that the "drivers/" has been mostly reviewed [6]. After this and the "kernel/*" are reviewed we only have 2 more chunks ("net/*" and miscellaneous) to complete the sentinel removal. Hurray!!! Why? By removing the sysctl sentinel elements we avoid kernel bloat as ctl_table arrays get moved out of kernel/sysctl.c into their own respective subsystems. This move was started long ago to avoid merge conflicts; the sentinel removal bit came after Mathew Wilcox suggested it to avoid bloating the kernel by one element as arrays moved out. This patchset will reduce the overall build time size of the kernel and run time memory bloat by about ~64 bytes per declared ctl_table array. I have consolidated some links that shed light on the history of this effort [2]. Testing: * Ran sysctl selftests (./tools/testing/selftests/sysctl/sysctl.sh) * Ran this through 0-day with no errors or warnings Size saving after this patchset: * bloat-o-meter - The "yesall" config saves 1920 bytes [4] - The "tiny" config saves 576 bytes [5] * If you want to know how many bytes are saved after all the chunks are merged see [3] Base commit: tag: sysctl-6.7-rc1 (8b793bcda61f) Comments/feedback greatly appreciated Best Joel --- Changes in v2: - changed commit message from "aio: *" to "fs: *" - We now register fsverity_sysctl_table with one call instead of selecting a call based CONFIG_FS_VERITY_BUILTIN_SIGNATURES - Link to v1: https://lore.kernel.org/r/202...@sa... [1] We are able to remove a sentinel table without behavioral change by introducing a table_size argument in the same place where procname is checked for NULL. The idea is for it to keep stopping when it hits ->procname == NULL, while the sentinel is still present. And when the sentinel is removed, it will stop on the table_size. You can go to (https://lore.kernel.org/all/202...@sa.../) for more information. [2] Links Related to the ctl_table sentinel removal: * E-mail threads that summarize the sentinel effort https://lore.kernel.org/all/ZO5Yx5JFogGi%2F...@bo.../ https://lore.kernel.org/all/ZMF...@bo.../ * Replacing the register functions: https://lore.kernel.org/all/202...@ke.../ https://lore.kernel.org/all/202...@ke.../ * E-mail threads discussing prposal https://lore.kernel.org/all/202...@vi... https://lore.kernel.org/all/202...@un... [3] Size saving after removing all sentinels: These are the bytes that we save after removing all the sentinels (this plus all the other chunks). I included them to get an idea of how much memory we are talking about. * bloat-o-meter: - The "yesall" configuration results save 9158 bytes https://lore.kernel.org/all/202...@sa.../ - The "tiny" config + CONFIG_SYSCTL save 1215 bytes https://lore.kernel.org/all/202...@sa.../ * memory usage: In memory savings are measured to be 7296 bytes. (here is how to measure [7]) [4] add/remove: 0/0 grow/shrink: 0/30 up/down: 0/-1920 (-1920) Function old new delta xfs_table 1024 960 -64 vm_userfaultfd_table 128 64 -64 test_table_unregister 128 64 -64 test_table 576 512 -64 root_table 128 64 -64 pty_table 256 192 -64 ocfs2_nm_table 128 64 -64 ntfs_sysctls 128 64 -64 nlm_sysctls 448 384 -64 nfs_cb_sysctls 192 128 -64 nfs4_cb_sysctls 192 128 -64 namei_sysctls 320 256 -64 locks_sysctls 192 128 -64 inotify_table 256 192 -64 inodes_sysctls 192 128 -64 fsverity_sysctl_table 128 64 -64 fs_stat_sysctls 256 192 -64 fs_shared_sysctls 192 128 -64 fs_pipe_sysctls 256 192 -64 fs_namespace_sysctls 128 64 -64 fs_exec_sysctls 128 64 -64 fs_dqstats_table 576 512 -64 fs_dcache_sysctls 128 64 -64 fanotify_table 256 192 -64 epoll_table 128 64 -64 dnotify_sysctls 128 64 -64 coredump_sysctls 256 192 -64 coda_table 256 192 -64 cachefiles_sysctls 128 64 -64 aio_sysctls 192 128 -64 Total: Before=429912331, After=429910411, chg -0.00% [5] add/remove: 0/0 grow/shrink: 0/9 up/down: 0/-576 (-576) Function old new delta root_table 128 64 -64 namei_sysctls 320 256 -64 inodes_sysctls 192 128 -64 fs_stat_sysctls 256 192 -64 fs_shared_sysctls 192 128 -64 fs_pipe_sysctls 256 192 -64 fs_namespace_sysctls 128 64 -64 fs_exec_sysctls 128 64 -64 fs_dcache_sysctls 128 64 -64 Total: Before=1886645, After=1886069, chg -0.03% [6] https://lore.kernel.org/all/202...@sa... [7] To measure the in memory savings apply this on top of this patchset. " diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c index c88854df0b62..e0073a627bac 100644 --- a/fs/proc/proc_sysctl.c +++ b/fs/proc/proc_sysctl.c @@ -976,6 +976,8 @@ static struct ctl_dir *new_dir(struct ctl_table_set *set, table[0].procname = new_name; table[0].mode = S_IFDIR|S_IRUGO|S_IXUGO; init_header(&new->header, set->dir.header.root, set, node, table, 1); + // Counts additional sentinel used for each new dir. + printk("%ld sysctl saved mem kzalloc \n", sizeof(struct ctl_table)); return new; } @@ -1199,6 +1201,9 @@ static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table_ link_name += len; link++; } + // Counts additional sentinel used for each new registration + // + printk("%ld sysctl saved mem kzalloc \n", sizeof(struct ctl_table)); init_header(links, dir->header.root, dir->header.set, node, link_table, head->ctl_table_size); links->nreg = nr_entries; " and then run the following bash script in the kernel: accum=0 for n in $(dmesg | grep kzalloc | awk '{print $3}') ; do echo $n accum=$(calc "$accum + $n") done echo $accum To: Luis Chamberlain <mc...@ke...> To: wi...@in... To: jo...@jo... To: Kees Cook <kee...@ch...> To: David Howells <dho...@re...> To: Alexander Viro <vi...@ze...> To: Christian Brauner <br...@ke...> To: Benjamin LaHaise <bc...@kv...> To: Eric Biederman <ebi...@xm...> To: Trond Myklebust <tro...@ha...> To: Anna Schumaker <an...@ke...> To: Chuck Lever <chu...@or...> To: Jeff Layton <jl...@ke...> To: Neil Brown <ne...@su...> To: Olga Kornievskaia <ko...@ne...> To: Dai Ngo <Da...@or...> To: Tom Talpey <to...@ta...> To: Jan Kara <ja...@su...> To: Amir Goldstein <ami...@gm...> To: Matthew Bobrowski <re...@go...> To: Anton Altaparmakov <an...@tu...> To: Namjae Jeon <lin...@ke...> To: Mark Fasheh <ma...@fa...> To: Joel Becker <jl...@ev...> To: Joseph Qi <jos...@li...> To: Iurii Zaikin <yz...@go...> To: Eric Biggers <ebi...@ke...> To: "Theodore Y. Ts'o" <ty...@mi...> To: Chandan Babu R <cha...@or...> To: "Darrick J. Wong" <dj...@ke...> To: Jan Harkes <jah...@cs...> To: co...@cs... Cc: lin...@re... Cc: lin...@vg... Cc: lin...@vg... Cc: lin...@kv... Cc: lin...@kv... Cc: lin...@vg... Cc: lin...@li... Cc: ocf...@li...v Cc: fsv...@li...v Cc: lin...@vg... Cc: cod...@co... --- Signed-off-by: Joel Granados <j.g...@sa...> --- Joel Granados (4): cachefiles: Remove the now superfluous sentinel element from ctl_table array fs: Remove the now superfluous sentinel elements from ctl_table array sysctl: Remove the now superfluous sentinel elements from ctl_table array coda: Remove the now superfluous sentinel elements from ctl_table array fs/aio.c | 1 - fs/cachefiles/error_inject.c | 1 - fs/coda/sysctl.c | 1 - fs/coredump.c | 1 - fs/dcache.c | 1 - fs/devpts/inode.c | 1 - fs/eventpoll.c | 1 - fs/exec.c | 1 - fs/file_table.c | 1 - fs/inode.c | 1 - fs/lockd/svc.c | 1 - fs/locks.c | 1 - fs/namei.c | 1 - fs/namespace.c | 1 - fs/nfs/nfs4sysctl.c | 1 - fs/nfs/sysctl.c | 1 - fs/notify/dnotify/dnotify.c | 1 - fs/notify/fanotify/fanotify_user.c | 1 - fs/notify/inotify/inotify_user.c | 1 - fs/ntfs/sysctl.c | 1 - fs/ocfs2/stackglue.c | 1 - fs/pipe.c | 1 - fs/proc/proc_sysctl.c | 1 - fs/quota/dquot.c | 1 - fs/sysctls.c | 1 - fs/userfaultfd.c | 1 - fs/verity/init.c | 1 - fs/xfs/xfs_sysctl.c | 2 -- lib/test_sysctl.c | 2 -- 29 files changed, 31 deletions(-) --- base-commit: 8b793bcda61f6c3ed4f5b2ded7530ef6749580cb change-id: 20231107-jag-sysctl_remove_empty_elem_fs-dbdcf6581fbe Best regards, -- Joel Granados <j.g...@sa...> |
|
From: Joel G. v. B4 R. <dev...@ke...> - 2023-11-21 11:35:50
|
From: Joel Granados <j.g...@sa...> This commit comes at the tail end of a greater effort to remove the empty elements at the end of the ctl_table arrays (sentinels) which will reduce the overall build time size of the kernel and run time memory bloat by ~64 bytes per sentinel (further information Link : https://lore.kernel.org/all/ZO5Yx5JFogGi%2F...@bo.../) Remove sentinel from cachefiles_sysctls Signed-off-by: Joel Granados <j.g...@sa...> --- fs/cachefiles/error_inject.c | 1 - 1 file changed, 1 deletion(-) diff --git a/fs/cachefiles/error_inject.c b/fs/cachefiles/error_inject.c index 18de8a876b02..1715d5ca2b2d 100644 --- a/fs/cachefiles/error_inject.c +++ b/fs/cachefiles/error_inject.c @@ -19,7 +19,6 @@ static struct ctl_table cachefiles_sysctls[] = { .mode = 0644, .proc_handler = proc_douintvec, }, - {} }; int __init cachefiles_register_error_injection(void) -- 2.30.2 |
|
From: Joel G. v. B4 R. <dev...@ke...> - 2023-11-21 11:35:44
|
From: Joel Granados <j.g...@sa...> This commit comes at the tail end of a greater effort to remove the empty elements at the end of the ctl_table arrays (sentinels) which will reduce the overall build time size of the kernel and run time memory bloat by ~64 bytes per sentinel (further information Link : https://lore.kernel.org/all/ZO5Yx5JFogGi%2F...@bo.../) Remove sentinel elements ctl_table struct. Special attention was placed in making sure that an empty directory for fs/verity was created when CONFIG_FS_VERITY_BUILTIN_SIGNATURES is not defined. In this case we use the register sysctl call that expects a size. Signed-off-by: Joel Granados <j.g...@sa...> Reviewed-by: Jan Kara <ja...@su...> Reviewed-by: Darrick J. Wong <dj...@ke...> --- fs/aio.c | 1 - fs/coredump.c | 1 - fs/dcache.c | 1 - fs/devpts/inode.c | 1 - fs/eventpoll.c | 1 - fs/exec.c | 1 - fs/file_table.c | 1 - fs/inode.c | 1 - fs/lockd/svc.c | 1 - fs/locks.c | 1 - fs/namei.c | 1 - fs/namespace.c | 1 - fs/nfs/nfs4sysctl.c | 1 - fs/nfs/sysctl.c | 1 - fs/notify/dnotify/dnotify.c | 1 - fs/notify/fanotify/fanotify_user.c | 1 - fs/notify/inotify/inotify_user.c | 1 - fs/ntfs/sysctl.c | 1 - fs/ocfs2/stackglue.c | 1 - fs/pipe.c | 1 - fs/proc/proc_sysctl.c | 1 - fs/quota/dquot.c | 1 - fs/sysctls.c | 1 - fs/userfaultfd.c | 1 - fs/verity/init.c | 1 - fs/xfs/xfs_sysctl.c | 2 -- 26 files changed, 27 deletions(-) diff --git a/fs/aio.c b/fs/aio.c index a4c2a6bac72c..da069d6b6c66 100644 --- a/fs/aio.c +++ b/fs/aio.c @@ -239,7 +239,6 @@ static struct ctl_table aio_sysctls[] = { .mode = 0644, .proc_handler = proc_doulongvec_minmax, }, - {} }; static void __init aio_sysctl_init(void) diff --git a/fs/coredump.c b/fs/coredump.c index 9d235fa14ab9..f258c17c1841 100644 --- a/fs/coredump.c +++ b/fs/coredump.c @@ -981,7 +981,6 @@ static struct ctl_table coredump_sysctls[] = { .mode = 0644, .proc_handler = proc_dointvec, }, - { } }; static int __init init_fs_coredump_sysctls(void) diff --git a/fs/dcache.c b/fs/dcache.c index 25ac74d30bff..bafdd455b0fe 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -191,7 +191,6 @@ static struct ctl_table fs_dcache_sysctls[] = { .mode = 0444, .proc_handler = proc_nr_dentry, }, - { } }; static int __init init_fs_dcache_sysctls(void) diff --git a/fs/devpts/inode.c b/fs/devpts/inode.c index 299c295a27a0..a4de1612b1db 100644 --- a/fs/devpts/inode.c +++ b/fs/devpts/inode.c @@ -69,7 +69,6 @@ static struct ctl_table pty_table[] = { .data = &pty_count, .proc_handler = proc_dointvec, }, - {} }; struct pts_mount_opts { diff --git a/fs/eventpoll.c b/fs/eventpoll.c index 1d9a71a0c4c1..975fc5623102 100644 --- a/fs/eventpoll.c +++ b/fs/eventpoll.c @@ -322,7 +322,6 @@ static struct ctl_table epoll_table[] = { .extra1 = &long_zero, .extra2 = &long_max, }, - { } }; static void __init epoll_sysctls_init(void) diff --git a/fs/exec.c b/fs/exec.c index 6518e33ea813..7a18bde22f25 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -2167,7 +2167,6 @@ static struct ctl_table fs_exec_sysctls[] = { .extra1 = SYSCTL_ZERO, .extra2 = SYSCTL_TWO, }, - { } }; static int __init init_fs_exec_sysctls(void) diff --git a/fs/file_table.c b/fs/file_table.c index ee21b3da9d08..544f7d4f166f 100644 --- a/fs/file_table.c +++ b/fs/file_table.c @@ -137,7 +137,6 @@ static struct ctl_table fs_stat_sysctls[] = { .extra1 = &sysctl_nr_open_min, .extra2 = &sysctl_nr_open_max, }, - { } }; static int __init init_fs_stat_sysctls(void) diff --git a/fs/inode.c b/fs/inode.c index 35fd688168c5..ce16e3cda7bf 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -129,7 +129,6 @@ static struct ctl_table inodes_sysctls[] = { .mode = 0444, .proc_handler = proc_nr_inodes, }, - { } }; static int __init init_fs_inode_sysctls(void) diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c index 6579948070a4..f784ff58bfd3 100644 --- a/fs/lockd/svc.c +++ b/fs/lockd/svc.c @@ -474,7 +474,6 @@ static struct ctl_table nlm_sysctls[] = { .mode = 0644, .proc_handler = proc_dointvec, }, - { } }; #endif /* CONFIG_SYSCTL */ diff --git a/fs/locks.c b/fs/locks.c index 76ad05f8070a..6ecfc422fb37 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -111,7 +111,6 @@ static struct ctl_table locks_sysctls[] = { .proc_handler = proc_dointvec, }, #endif /* CONFIG_MMU */ - {} }; static int __init init_fs_locks_sysctls(void) diff --git a/fs/namei.c b/fs/namei.c index 567ee547492b..fb552161c981 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1070,7 +1070,6 @@ static struct ctl_table namei_sysctls[] = { .extra1 = SYSCTL_ZERO, .extra2 = SYSCTL_TWO, }, - { } }; static int __init init_fs_namei_sysctls(void) diff --git a/fs/namespace.c b/fs/namespace.c index e157efc54023..e95d4328539d 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -5008,7 +5008,6 @@ static struct ctl_table fs_namespace_sysctls[] = { .proc_handler = proc_dointvec_minmax, .extra1 = SYSCTL_ONE, }, - { } }; static int __init init_fs_namespace_sysctls(void) diff --git a/fs/nfs/nfs4sysctl.c b/fs/nfs/nfs4sysctl.c index e776200e9a11..886a7c4c60b3 100644 --- a/fs/nfs/nfs4sysctl.c +++ b/fs/nfs/nfs4sysctl.c @@ -34,7 +34,6 @@ static struct ctl_table nfs4_cb_sysctls[] = { .mode = 0644, .proc_handler = proc_dointvec, }, - { } }; int nfs4_register_sysctl(void) diff --git a/fs/nfs/sysctl.c b/fs/nfs/sysctl.c index f39e2089bc4c..e645be1a3381 100644 --- a/fs/nfs/sysctl.c +++ b/fs/nfs/sysctl.c @@ -29,7 +29,6 @@ static struct ctl_table nfs_cb_sysctls[] = { .mode = 0644, .proc_handler = proc_dointvec, }, - { } }; int nfs_register_sysctl(void) diff --git a/fs/notify/dnotify/dnotify.c b/fs/notify/dnotify/dnotify.c index ebdcc25df0f7..8151ed5ddefc 100644 --- a/fs/notify/dnotify/dnotify.c +++ b/fs/notify/dnotify/dnotify.c @@ -29,7 +29,6 @@ static struct ctl_table dnotify_sysctls[] = { .mode = 0644, .proc_handler = proc_dointvec, }, - {} }; static void __init dnotify_sysctl_init(void) { diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c index f69c451018e3..80539839af0c 100644 --- a/fs/notify/fanotify/fanotify_user.c +++ b/fs/notify/fanotify/fanotify_user.c @@ -86,7 +86,6 @@ static struct ctl_table fanotify_table[] = { .proc_handler = proc_dointvec_minmax, .extra1 = SYSCTL_ZERO }, - { } }; static void __init fanotify_sysctls_init(void) diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c index 1c4bfdab008d..3e222a271da6 100644 --- a/fs/notify/inotify/inotify_user.c +++ b/fs/notify/inotify/inotify_user.c @@ -85,7 +85,6 @@ static struct ctl_table inotify_table[] = { .proc_handler = proc_dointvec_minmax, .extra1 = SYSCTL_ZERO }, - { } }; static void __init inotify_sysctls_init(void) diff --git a/fs/ntfs/sysctl.c b/fs/ntfs/sysctl.c index 174fe536a1c0..4e980170d86a 100644 --- a/fs/ntfs/sysctl.c +++ b/fs/ntfs/sysctl.c @@ -28,7 +28,6 @@ static struct ctl_table ntfs_sysctls[] = { .mode = 0644, /* Mode, proc handler. */ .proc_handler = proc_dointvec }, - {} }; /* Storage for the sysctls header. */ diff --git a/fs/ocfs2/stackglue.c b/fs/ocfs2/stackglue.c index a8d5ca98fa57..20aa37b67cfb 100644 --- a/fs/ocfs2/stackglue.c +++ b/fs/ocfs2/stackglue.c @@ -658,7 +658,6 @@ static struct ctl_table ocfs2_nm_table[] = { .mode = 0644, .proc_handler = proc_dostring, }, - { } }; static struct ctl_table_header *ocfs2_table_header; diff --git a/fs/pipe.c b/fs/pipe.c index 6c1a9b1db907..6bc1c4ae81d5 100644 --- a/fs/pipe.c +++ b/fs/pipe.c @@ -1492,7 +1492,6 @@ static struct ctl_table fs_pipe_sysctls[] = { .mode = 0644, .proc_handler = proc_doulongvec_minmax, }, - { } }; #endif diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c index de484195f49f..4e06c4d69906 100644 --- a/fs/proc/proc_sysctl.c +++ b/fs/proc/proc_sysctl.c @@ -71,7 +71,6 @@ static struct ctl_table root_table[] = { .procname = "", .mode = S_IFDIR|S_IRUGO|S_IXUGO, }, - { } }; static struct ctl_table_root sysctl_table_root = { .default_set.dir.header = { diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c index 9e72bfe8bbad..69b03e13e6f2 100644 --- a/fs/quota/dquot.c +++ b/fs/quota/dquot.c @@ -2949,7 +2949,6 @@ static struct ctl_table fs_dqstats_table[] = { .proc_handler = proc_dointvec, }, #endif - { }, }; static int __init dquot_init(void) diff --git a/fs/sysctls.c b/fs/sysctls.c index 76a0aee8c229..8dbde9a802fa 100644 --- a/fs/sysctls.c +++ b/fs/sysctls.c @@ -26,7 +26,6 @@ static struct ctl_table fs_shared_sysctls[] = { .extra1 = SYSCTL_ZERO, .extra2 = SYSCTL_MAXOLDUID, }, - { } }; static int __init init_fs_sysctls(void) diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c index 56eaae9dac1a..7668285779c1 100644 --- a/fs/userfaultfd.c +++ b/fs/userfaultfd.c @@ -45,7 +45,6 @@ static struct ctl_table vm_userfaultfd_table[] = { .extra1 = SYSCTL_ZERO, .extra2 = SYSCTL_ONE, }, - { } }; #endif diff --git a/fs/verity/init.c b/fs/verity/init.c index a29f062f6047..b64a76b9ac36 100644 --- a/fs/verity/init.c +++ b/fs/verity/init.c @@ -24,7 +24,6 @@ static struct ctl_table fsverity_sysctl_table[] = { .extra2 = SYSCTL_ONE, }, #endif - { } }; static void __init fsverity_init_sysctl(void) diff --git a/fs/xfs/xfs_sysctl.c b/fs/xfs/xfs_sysctl.c index fade33735393..a191f6560f98 100644 --- a/fs/xfs/xfs_sysctl.c +++ b/fs/xfs/xfs_sysctl.c @@ -206,8 +206,6 @@ static struct ctl_table xfs_table[] = { .extra2 = &xfs_params.stats_clear.max }, #endif /* CONFIG_PROC_FS */ - - {} }; int -- 2.30.2 |
|
From: Joel G. v. B4 R. <dev...@ke...> - 2023-11-21 11:35:44
|
From: Joel Granados <j.g...@sa...> This commit comes at the tail end of a greater effort to remove the empty elements at the end of the ctl_table arrays (sentinels) which will reduce the overall build time size of the kernel and run time memory bloat by ~64 bytes per sentinel (further information Link : https://lore.kernel.org/all/ZO5Yx5JFogGi%2F...@bo.../) Remove empty sentinel from coda_table Signed-off-by: Joel Granados <j.g...@sa...> --- fs/coda/sysctl.c | 1 - 1 file changed, 1 deletion(-) diff --git a/fs/coda/sysctl.c b/fs/coda/sysctl.c index a247c14aaab7..9f2d5743e2c8 100644 --- a/fs/coda/sysctl.c +++ b/fs/coda/sysctl.c @@ -36,7 +36,6 @@ static struct ctl_table coda_table[] = { .mode = 0600, .proc_handler = proc_dointvec }, - {} }; void coda_sysctl_init(void) -- 2.30.2 |
|
From: Joel G. <j.g...@sa...> - 2023-11-09 21:12:30
|
On Thu, Nov 09, 2023 at 08:08:31AM -0800, Eric Biggers wrote:
> On Thu, Nov 09, 2023 at 05:00:40PM +0100, Joel Granados wrote:
> > > > static void __init fsverity_init_sysctl(void)
> > > > {
> > > > +#ifdef CONFIG_FS_VERITY_BUILTIN_SIGNATURES
> > > > fsverity_sysctl_header = register_sysctl("fs/verity",
> > > > fsverity_sysctl_table);
> > > > +#else
> > > > + fsverity_sysctl_header = register_sysctl_sz("fs/verity",
> > > > + fsverity_sysctl_table, 0);
> > > > +#endif
> > > > if (!fsverity_sysctl_header)
> > > > panic("fsverity sysctl registration failed");
> > >
> > > This does not make sense, and it causes a build error when CONFIG_FS_VERITY=y
> > > and CONFIG_FS_VERITY_BUILTIN_SIGNATURES=n.
> > >
> > > I think all you need to do is delete the sentinel element, the same as
> > > everywhere else. I just tested it, and it works fine.
> > I found the reason why I added the CONFIG_FS_VERITY_BUILTIN_SIGNATURES
> > here: it is related to
> > https://lore.kernel.org/all/202...@ke.../
> > where the directory is registered with an element only if
> > CONFIG_FS_VERITY_BUILTIN_SIGNATURES is defined. I had forgotten, but I
> > even asked for a clarification on the patch :).
> >
> > I see that that patch made it to v6.6. So the solution is not to remove
> > the CONFIG_FS_VERITY_BUILTIN_SIGNATURES, but for me to rebase on top of
> > a more up to date base.
> >
> > @Eric: Please get back to me if the patch in
> > https://lore.kernel.org/all/202...@ke.../
> > is no longer relevant.
> >
> > Best.
>
> Yes, that patch was merged in 6.6. I don't think it really matters here though,
> other than the fact that it moved the code to a different file. I believe all
> you need to do is remove the sentinel element, the same as anywhere else:
Indeed. I thought that I had to handle empty array in a special way, but
it seems that ARRAY_SIZE works for empty arrays as well. I'll correct
this as well. Thx again for the feedback.
Best
>
> diff --git a/fs/verity/init.c b/fs/verity/init.c
> index a29f062f6047b..b64a76b9ac362 100644
> --- a/fs/verity/init.c
> +++ b/fs/verity/init.c
> @@ -24,7 +24,6 @@ static struct ctl_table fsverity_sysctl_table[] = {
> .extra2 = SYSCTL_ONE,
> },
> #endif
> - { }
> };
>
> static void __init fsverity_init_sysctl(void)
--
Joel Granados
|
|
From: Eric B. <ebi...@ke...> - 2023-11-09 16:08:44
|
On Thu, Nov 09, 2023 at 05:00:40PM +0100, Joel Granados wrote:
> > > static void __init fsverity_init_sysctl(void)
> > > {
> > > +#ifdef CONFIG_FS_VERITY_BUILTIN_SIGNATURES
> > > fsverity_sysctl_header = register_sysctl("fs/verity",
> > > fsverity_sysctl_table);
> > > +#else
> > > + fsverity_sysctl_header = register_sysctl_sz("fs/verity",
> > > + fsverity_sysctl_table, 0);
> > > +#endif
> > > if (!fsverity_sysctl_header)
> > > panic("fsverity sysctl registration failed");
> >
> > This does not make sense, and it causes a build error when CONFIG_FS_VERITY=y
> > and CONFIG_FS_VERITY_BUILTIN_SIGNATURES=n.
> >
> > I think all you need to do is delete the sentinel element, the same as
> > everywhere else. I just tested it, and it works fine.
> I found the reason why I added the CONFIG_FS_VERITY_BUILTIN_SIGNATURES
> here: it is related to
> https://lore.kernel.org/all/202...@ke.../
> where the directory is registered with an element only if
> CONFIG_FS_VERITY_BUILTIN_SIGNATURES is defined. I had forgotten, but I
> even asked for a clarification on the patch :).
>
> I see that that patch made it to v6.6. So the solution is not to remove
> the CONFIG_FS_VERITY_BUILTIN_SIGNATURES, but for me to rebase on top of
> a more up to date base.
>
> @Eric: Please get back to me if the patch in
> https://lore.kernel.org/all/202...@ke.../
> is no longer relevant.
>
> Best.
Yes, that patch was merged in 6.6. I don't think it really matters here though,
other than the fact that it moved the code to a different file. I believe all
you need to do is remove the sentinel element, the same as anywhere else:
diff --git a/fs/verity/init.c b/fs/verity/init.c
index a29f062f6047b..b64a76b9ac362 100644
--- a/fs/verity/init.c
+++ b/fs/verity/init.c
@@ -24,7 +24,6 @@ static struct ctl_table fsverity_sysctl_table[] = {
.extra2 = SYSCTL_ONE,
},
#endif
- { }
};
static void __init fsverity_init_sysctl(void)
|
|
From: Joel G. <j.g...@sa...> - 2023-11-09 16:00:54
|
On Tue, Nov 07, 2023 at 07:42:31PM -0800, Eric Biggers wrote:
> On Tue, Nov 07, 2023 at 02:44:21PM +0100, Joel Granados via B4 Relay wrote:
> > [PATCH 2/4] aio: Remove the now superfluous sentinel elements from ctl_table array
>
> The commit prefix should be "fs:".
>
> > Remove sentinel elements ctl_table struct. Special attention was placed in
> > making sure that an empty directory for fs/verity was created when
> > CONFIG_FS_VERITY_BUILTIN_SIGNATURES is not defined. In this case we use the
> > register sysctl call that expects a size.
> [...]
> > diff --git a/fs/verity/fsverity_private.h b/fs/verity/fsverity_private.h
> > index d071a6e32581..8191bf7ad706 100644
> > --- a/fs/verity/fsverity_private.h
> > +++ b/fs/verity/fsverity_private.h
> > @@ -122,8 +122,8 @@ void __init fsverity_init_info_cache(void);
> >
> > /* signature.c */
> >
> > -#ifdef CONFIG_FS_VERITY_BUILTIN_SIGNATURES
> > extern int fsverity_require_signatures;
> > +#ifdef CONFIG_FS_VERITY_BUILTIN_SIGNATURES
> > int fsverity_verify_signature(const struct fsverity_info *vi,
> > const u8 *signature, size_t sig_size);
> >
> > diff --git a/fs/verity/init.c b/fs/verity/init.c
> > index a29f062f6047..e31045dd4f6c 100644
> > --- a/fs/verity/init.c
> > +++ b/fs/verity/init.c
> > @@ -13,7 +13,6 @@
> > static struct ctl_table_header *fsverity_sysctl_header;
> >
> > static struct ctl_table fsverity_sysctl_table[] = {
> > -#ifdef CONFIG_FS_VERITY_BUILTIN_SIGNATURES
> > {
> > .procname = "require_signatures",
> > .data = &fsverity_require_signatures,
> > @@ -23,14 +22,17 @@ static struct ctl_table fsverity_sysctl_table[] = {
> > .extra1 = SYSCTL_ZERO,
> > .extra2 = SYSCTL_ONE,
> > },
> > -#endif
> > - { }
> > };
> >
> > static void __init fsverity_init_sysctl(void)
> > {
> > +#ifdef CONFIG_FS_VERITY_BUILTIN_SIGNATURES
> > fsverity_sysctl_header = register_sysctl("fs/verity",
> > fsverity_sysctl_table);
> > +#else
> > + fsverity_sysctl_header = register_sysctl_sz("fs/verity",
> > + fsverity_sysctl_table, 0);
> > +#endif
> > if (!fsverity_sysctl_header)
> > panic("fsverity sysctl registration failed");
>
> This does not make sense, and it causes a build error when CONFIG_FS_VERITY=y
> and CONFIG_FS_VERITY_BUILTIN_SIGNATURES=n.
>
> I think all you need to do is delete the sentinel element, the same as
> everywhere else. I just tested it, and it works fine.
I found the reason why I added the CONFIG_FS_VERITY_BUILTIN_SIGNATURES
here: it is related to
https://lore.kernel.org/all/202...@ke.../
where the directory is registered with an element only if
CONFIG_FS_VERITY_BUILTIN_SIGNATURES is defined. I had forgotten, but I
even asked for a clarification on the patch :).
I see that that patch made it to v6.6. So the solution is not to remove
the CONFIG_FS_VERITY_BUILTIN_SIGNATURES, but for me to rebase on top of
a more up to date base.
@Eric: Please get back to me if the patch in
https://lore.kernel.org/all/202...@ke.../
is no longer relevant.
Best.
>
> BTW, the comments for register_sysctl_sz() and __register_sysctl_table() are
> outdated, as they still say "A completely 0 filled entry terminates the table."
>
> - Eric
--
Joel Granados
|
