Hi,
On 7 May 2014, at 15:54, Sergei Antonov <saproj@xxxxxxxxx> wrote:
> hfsplus_readdir() incorrectly returned DT_REG for symbolic links and special
> files. Return DT_LNK, DT_FIFO, DT_CHR, DT_REG, DT_SOCK, or DT_UNKNOWN according
> to mode field in catalog record. Programs relying on information from readdir
> will now work correctly with HFS+.
>
> CC: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
> CC: Christoph Hellwig <hch@xxxxxxxxxxxxx>
> CC: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
> CC: Vyacheslav Dubeyko <slava@xxxxxxxxxxx>
> CC: Hin-Tak Leung <htl10@xxxxxxxxxxxxxxxxxxxxx>
> Signed-off-by: Sergei Antonov <saproj@xxxxxxxxx>
> ---
> fs/hfsplus/dir.c | 20 +++++++++++++++++++-
> 1 file changed, 19 insertions(+), 1 deletion(-)
>
> diff --git a/fs/hfsplus/dir.c b/fs/hfsplus/dir.c
> index bdec665..8397d64 100644
> --- a/fs/hfsplus/dir.c
> +++ b/fs/hfsplus/dir.c
> @@ -212,13 +212,31 @@ static int hfsplus_readdir(struct file *file, struct dir_context *ctx)
> be32_to_cpu(entry.folder.id), DT_DIR))
> break;
> } else if (type == HFSPLUS_FILE) {
> + u16 mode;
> + unsigned type = DT_UNKNOWN;
> +
> if (fd.entrylength < sizeof(struct hfsplus_cat_file)) {
> pr_err("small file entry\n");
> err = -EIO;
> goto out;
> }
> +
> + mode = be16_to_cpu(entry.file.permissions.mode);
> + if (S_ISFIFO(mode))
> + type = DT_FIFO;
> + if (S_ISCHR(mode))
> + type = DT_CHR;
> + if (S_ISBLK(mode))
> + type = DT_BLK;
> + if (S_ISREG(mode))
> + type = DT_REG;
> + if (S_ISLNK(mode))
> + type = DT_LNK;
> + if (S_ISSOCK(mode))
> + type = DT_SOCK;
> +
I would either use "switch"/"case" or "else if" instead of "if" otherwise you are doing all the checks for all the types even after you have found the right one - also place the DT_REG check first as that is the common case...
Best regards,
Anton
> if (!dir_emit(ctx, strbuf, len,
> - be32_to_cpu(entry.file.id), DT_REG))
> + be32_to_cpu(entry.file.id), type))
> break;
> } else {
> pr_err("bad catalog entry type\n");
--
Anton Altaparmakov <aia21 at cam.ac.uk> (replace at with @)
University of Cambridge Information Services, Roger Needham Building
7 JJ Thomson Avenue, Cambridge, CB3 0RB, UK
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
