linux/fs/ext4/inline.c, branch v4.3

ext4 crypto: optimize filename encryption

2015-05-18T17:14:47Z

Encrypt the filename as soon it is passed in by the user. This avoids our needing to encrypt the filename 2 or 3 times while in the process of creating a filename. Similarly, when looking up a directory entry, encrypt the filename early, or if the encryption key is not available, base-64 decode the file syystem so that the hash value and the last 16 bytes of the encrypted filename is available in the new struct ext4_filename data structure. Signed-off-by: Theodore Ts'o

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2015-04-27T00:22:07Z

Pull fourth vfs update from Al Viro: "d_inode() annotations from David Howells (sat in for-next since before the beginning of merge window) + four assorted fixes" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: RCU pathwalk breakage when running into a symlink overmounting something fix I_DIO_WAKEUP definition direct-io: only inc/dec inode->i_dio_count for file systems fs/9p: fix readdir() VFS: assorted d_backing_inode() annotations VFS: fs/inode.c helpers: d_inode() annotations VFS: fs/cachefiles: d_backing_inode() annotations VFS: fs library helpers: d_inode() annotations VFS: assorted weird filesystems: d_inode() annotations VFS: normal filesystems (and lustre): d_inode() annotations VFS: security/: d_inode() annotations VFS: security/: d_backing_inode() annotations VFS: net/: d_inode() annotations VFS: net/unix: d_backing_inode() annotations VFS: kernel/: d_inode() annotations VFS: audit: d_backing_inode() annotations VFS: Fix up some ->d_inode accesses in the chelsio driver VFS: Cachefiles should perform fs modifications on the top layer only VFS: AF_UNIX sockets should call mknod on the top layer only

VFS: normal filesystems (and lustre): d_inode() annotations

2015-04-15T19:06:57Z

that's the bulk of filesystem drivers dealing with inodes of their own Signed-off-by: David Howells Signed-off-by: Al Viro

ext4 crypto: insert encrypted filenames into a leaf directory block

2015-04-12T04:56:28Z

Signed-off-by: Uday Savagaonkar Signed-off-by: Ildar Muslukhov Signed-off-by: Michael Halcrow Signed-off-by: Theodore Ts'o

ext4 crypto: teach ext4_htree_store_dirent() to store decrypted filenames

2015-04-12T04:56:26Z

For encrypted directories, we need to pass in a separate parameter for the decrypted filename, since the directory entry contains the encrypted filename. Signed-off-by: Theodore Ts'o

ext4: fix transposition typo in format string

2015-04-02T20:42:43Z

According to C99, %*.s means the same as %*.0s, in other words, print as many spaces as the field width argument says and effectively ignore the string argument. That is certainly not what was meant here. The kernel's printf implementation, however, treats it as if the . was not there, i.e. as %*s. I don't know if de->name is nul-terminated or not, but in any case I'm guessing the intention was to use de->name_len as precision instead of field width. [ Note: this is debugging code which is commented out, so this is not security issue; a developer would have to explicitly enable INLINE_DIR_DEBUG before this would be an issue. ] Signed-off-by: Rasmus Villemoes Signed-off-by: Theodore Ts'o

ext4: ext4_da_convert_inline_data_to_extent drop locked page after error

2014-12-06T02:37:15Z

Testcase: xfstests generic/270 MKFS_OPTIONS="-q -I 256 -O inline_data,64bit" Call Trace: [] lock_page+0x35/0x39 -------> DEADLOCK [] pagecache_get_page+0x65/0x15a [] truncate_inode_pages_range+0x1db/0x45c [] ? ext4_da_get_block_prep+0x439/0x4b6 [] ? __block_write_begin+0x284/0x29c [] ? ext4_change_inode_journal_flag+0x16b/0x16b [] truncate_inode_pages+0x12/0x14 [] ext4_truncate_failed_write+0x19/0x25 [] ext4_da_write_inline_data_begin+0x196/0x31c [] ext4_da_write_begin+0x189/0x302 [] ? trace_hardirqs_on+0xd/0xf [] ? read_seqcount_begin.clone.1+0x9f/0xcc [] generic_perform_write+0xc7/0x1c6 [] ? mark_held_locks+0x59/0x77 [] __generic_file_write_iter+0x17f/0x1c5 [] ext4_file_write_iter+0x2a5/0x354 [] ? file_start_write+0x2a/0x2c [] ? bad_area_nosemaphore+0x13/0x15 [] new_sync_write+0x8a/0xb2 [] vfs_write+0xb5/0x14d [] SyS_write+0x5c/0x8c [] system_call_fastpath+0x12/0x17 Signed-off-by: Dmitry Monakhov Signed-off-by: Theodore Ts'o

ext4: ext4_inline_data_fiemap should respect callers argument

2014-12-02T21:11:20Z

Currently ext4_inline_data_fiemap ignores requested arguments (start and len) which may lead endless loop if start != 0. Also fix incorrect extent length determination. Signed-off-by: Dmitry Monakhov Signed-off-by: Theodore Ts'o

ext4: prevent fsreentrance deadlock for inline_data

2014-12-02T21:09:50Z

ext4_da_convert_inline_data_to_extent() invokes grab_cache_page_write_begin(). grab_cache_page_write_begin performs memory allocation, so fs-reentrance should be prohibited because we are inside journal transaction. Signed-off-by: Dmitry Monakhov Signed-off-by: Theodore Ts'o

ext4: Replace open coded mdata csum feature to helper function

2014-10-13T07:36:16Z

Besides the fact that this replacement improves code readability it also protects from errors caused direct EXT4_S(sb)->s_es manipulation which may result attempt to use uninitialized csum machinery. #Testcase_BEGIN IMG=/dev/ram0 MNT=/mnt mkfs.ext4 $IMG mount $IMG $MNT #Enable feature directly on disk, on mounted fs tune2fs -O metadata_csum $IMG # Provoke metadata update, likey result in OOPS touch $MNT/test umount $MNT #Testcase_END # Replacement script @@ expression E; @@ - EXT4_HAS_RO_COMPAT_FEATURE(E, EXT4_FEATURE_RO_COMPAT_METADATA_CSUM) + ext4_has_metadata_csum(E) https://bugzilla.kernel.org/show_bug.cgi?id=82201 Signed-off-by: Dmitry Monakhov Signed-off-by: Theodore Ts'o Cc: stable@vger.kernel.org