diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-05-14 10:19:22 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-05-14 10:19:22 +1000 |
| commit | 8b6ee04067310a6397476f05f06e52dabd8b0bb6 (patch) | |
| tree | 022a153b777a9e38f49d46e4fb8f1e6747d4a5f4 /fs/hfsplus/dir.c | |
| parent | b48d441a8ab8a89bd32a3a981a05b8a26905dfc7 (diff) | |
| parent | 7c0482e3d055e5de056d3c693b821e39205b99ae (diff) | |
| download | op-kernel-dev-8b6ee04067310a6397476f05f06e52dabd8b0bb6.zip op-kernel-dev-8b6ee04067310a6397476f05f06e52dabd8b0bb6.tar.gz | |
Merge branch 'merge' into next
We want the irq fixes from the "merge" branch.
Diffstat (limited to 'fs/hfsplus/dir.c')
| -rw-r--r-- | fs/hfsplus/dir.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/fs/hfsplus/dir.c b/fs/hfsplus/dir.c index 88e155f..26b53fb 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); |
