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

Commit 6f24f892 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Linus Torvalds
Browse files

hfsplus: Fix potential buffer overflows 



Commit ec81aecb ("hfs: fix a potential buffer overflow") fixed a few
potential buffer overflows in the hfs filesystem.  But as Timo Warns
pointed out, these changes also need to be made on the hfsplus
filesystem as well.

Reported-by: default avatarTimo Warns <warns@pre-sense.de>
Acked-by: default avatarWANG Cong <amwang@redhat.com>
Cc: Alexey Khoroshilov <khoroshilov@ispras.ru>
Cc: Miklos Szeredi <mszeredi@suse.cz>
Cc: Sage Weil <sage@newdream.net>
Cc: Eugene Teo <eteo@redhat.com>
Cc: Roman Zippel <zippel@linux-m68k.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Dave Anderson <anderson@redhat.com>
Cc: stable <stable@vger.kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f756beba

fs/hfsplus/catalog.c

+4 −0
Original line number Diff line number Diff line
@@ -366,6 +366,10 @@ int hfsplus_rename_cat(u32 cnid, 
	err = hfs_brec_find(&src_fd);

	if (err)

		goto out;

	if (src_fd.entrylength > sizeof(entry) || src_fd.entrylength < 0) {

		err = -EIO;

		goto out;

	}



	hfs_bnode_read(src_fd.bnode, &entry, src_fd.entryoffset,

				src_fd.entrylength);

fs/hfsplus/dir.c

+11 −0
Original line number Diff line number Diff line
@@ -150,6 +150,11 @@ static int hfsplus_readdir(struct file *filp, void *dirent, filldir_t filldir) 
		filp->f_pos++;

		/* fall through */

	case 1:

		if (fd.entrylength > sizeof(entry) || fd.entrylength < 0) {

			err = -EIO;

			goto out;

		}



		hfs_bnode_read(fd.bnode, &entry, fd.entryoffset,

			fd.entrylength);

		if (be16_to_cpu(entry.type) != HFSPLUS_FOLDER_THREAD) {
@@ -181,6 +186,12 @@ static int hfsplus_readdir(struct file *filp, void *dirent, filldir_t filldir) 
			err = -EIO;

			goto out;

		}



		if (fd.entrylength > sizeof(entry) || fd.entrylength < 0) {

			err = -EIO;

			goto out;

		}



		hfs_bnode_read(fd.bnode, &entry, fd.entryoffset,

			fd.entrylength);

		type = be16_to_cpu(entry.type);