Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e83c1397 authored by Duane Griffin's avatar Duane Griffin Committed by Al Viro
Browse files

ext4: ensure fast symlinks are NUL-terminated 



Ensure fast symlink targets are NUL-terminated, even if corrupted
on-disk.

Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Theodore Ts'o <tytso@mit.edu>
Cc: adilger@sun.com
Cc: linux-ext4@vger.kernel.org
Signed-off-by: default avatarDuane Griffin <duaneg@dghda.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent b5ed3112

fs/ext4/inode.c

+5 −2
Original line number Original line Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <linux/writeback.h>

#include <linux/writeback.h>

#include <linux/pagevec.h>

#include <linux/pagevec.h>

#include <linux/mpage.h>

#include <linux/mpage.h>

#include <linux/namei.h>

#include <linux/uio.h>

#include <linux/uio.h>

#include <linux/bio.h>

#include <linux/bio.h>

#include "ext4_jbd2.h"

#include "ext4_jbd2.h"
@@ -4164,9 +4165,11 @@ struct inode *ext4_iget(struct super_block *sb, unsigned long ino) 
		inode->i_op = &ext4_dir_inode_operations;

		inode->i_op = &ext4_dir_inode_operations;

		inode->i_fop = &ext4_dir_operations;

		inode->i_fop = &ext4_dir_operations;

	} else if (S_ISLNK(inode->i_mode)) {

	} else if (S_ISLNK(inode->i_mode)) {

		if (ext4_inode_is_fast_symlink(inode))

		if (ext4_inode_is_fast_symlink(inode)) {

			inode->i_op = &ext4_fast_symlink_inode_operations;

			inode->i_op = &ext4_fast_symlink_inode_operations;

		else {

			nd_terminate_link(ei->i_data, inode->i_size,

				sizeof(ei->i_data) - 1);

		} else {

			inode->i_op = &ext4_symlink_inode_operations;

			inode->i_op = &ext4_symlink_inode_operations;

			ext4_set_aops(inode);

			ext4_set_aops(inode);

		}

		}