mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-16 22:38:04 +00:00
Koen Kooi
2177f80076
Duplicate patches between PSP and 3.2.17 have been dropped from the 3.2.17 series Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
80 lines
2.5 KiB
Diff
80 lines
2.5 KiB
Diff
From e5c4ffba0f91d7315823292c6a46a0e3a35cf5f1 Mon Sep 17 00:00:00 2001
|
|
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
Date: Fri, 4 May 2012 12:09:39 -0700
|
|
Subject: [PATCH 147/165] hfsplus: Fix potential buffer overflows
|
|
|
|
commit 6f24f892871acc47b40dd594c63606a17c714f77 upstream.
|
|
|
|
Commit ec81aecb2966 ("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: Timo Warns <warns@pre-sense.de>
|
|
Acked-by: WANG 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: Andrew Morton <akpm@linux-foundation.org>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
|
|
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
|
---
|
|
fs/hfsplus/catalog.c | 4 ++++
|
|
fs/hfsplus/dir.c | 11 +++++++++++
|
|
2 files changed, 15 insertions(+), 0 deletions(-)
|
|
|
|
diff --git a/fs/hfsplus/catalog.c b/fs/hfsplus/catalog.c
|
|
index 4dfbfec..ec2a9c2 100644
|
|
--- a/fs/hfsplus/catalog.c
|
|
+++ b/fs/hfsplus/catalog.c
|
|
@@ -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);
|
|
diff --git a/fs/hfsplus/dir.c b/fs/hfsplus/dir.c
|
|
index 4536cd3..5adb740 100644
|
|
--- a/fs/hfsplus/dir.c
|
|
+++ b/fs/hfsplus/dir.c
|
|
@@ -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);
|
|
--
|
|
1.7.7.6
|
|
|