From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sergei Antonov Subject: [PATCH] hfsplus: emit symlinks from readdir properly Date: Wed, 7 May 2014 14:08:14 +0200 Message-ID: <1399464494-12540-1-git-send-email-saproj@gmail.com> Cc: Al Viro , Christoph Hellwig , Andrew Morton , Vyacheslav Dubeyko , Hin-Tak Leung , Sergei Antonov To: linux-fsdevel@vger.kernel.org Return-path: Received: from mail-ee0-f47.google.com ([74.125.83.47]:60975 "EHLO mail-ee0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750933AbaEGMIb (ORCPT ); Wed, 7 May 2014 08:08:31 -0400 Received: by mail-ee0-f47.google.com with SMTP id c13so676336eek.6 for ; Wed, 07 May 2014 05:08:30 -0700 (PDT) Sender: linux-fsdevel-owner@vger.kernel.org List-ID: hfsplus_readdir() did not return DT_LNK record type for symbolic links. It emitted them as regular files (DT_REG). Programs relying on information from readdir did not work correctly with HFS+. CC: Al Viro CC: Christoph Hellwig CC: Andrew Morton CC: Vyacheslav Dubeyko CC: Hin-Tak Leung Signed-off-by: Sergei Antonov --- fs/hfsplus/dir.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/fs/hfsplus/dir.c b/fs/hfsplus/dir.c index bdec665..c5ccb11 100644 --- a/fs/hfsplus/dir.c +++ b/fs/hfsplus/dir.c @@ -212,13 +212,17 @@ 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; + 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 (!dir_emit(ctx, strbuf, len, - be32_to_cpu(entry.file.id), DT_REG)) + be32_to_cpu(entry.file.id), + S_ISLNK(mode) ? DT_LNK : DT_REG)) break; } else { pr_err("bad catalog entry type\n"); -- 1.9.0