summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2011-12-12 15:13:50 +0100
committerJan Kara <jack@suse.cz>2012-01-09 13:52:08 +0100
commitfef2e9f3301934773e4f1b3cc5c7bffb119346b8 (patch)
tree32db1ddfb36294b26a5df7d87ddc19fc9dd89267
parentd2eb8c359309ec45d6bf5b147303ab8e13be86ea (diff)
downloadlinux-3.10-fef2e9f3301934773e4f1b3cc5c7bffb119346b8.tar.gz
linux-3.10-fef2e9f3301934773e4f1b3cc5c7bffb119346b8.tar.bz2
linux-3.10-fef2e9f3301934773e4f1b3cc5c7bffb119346b8.zip
udf: Treat symlink component of type 2 as /
Currently, we ignore symlink component of type 2. But mkisofs and other OS' seem to treat it as / so do the same for compatibility. Reported-by: "Gábor S." <otnaccess@hotmail.com> Signed-off-by: Jan Kara <jack@suse.cz>
-rw-r--r--fs/udf/symlink.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/fs/udf/symlink.c b/fs/udf/symlink.c
index b1d4488b0f1..d7c6dbe4194 100644
--- a/fs/udf/symlink.c
+++ b/fs/udf/symlink.c
@@ -41,10 +41,16 @@ static void udf_pc_to_char(struct super_block *sb, unsigned char *from,
pc = (struct pathComponent *)(from + elen);
switch (pc->componentType) {
case 1:
- if (pc->lengthComponentIdent == 0) {
- p = to;
- *p++ = '/';
- }
+ /*
+ * Symlink points to some place which should be agreed
+ * upon between originator and receiver of the media. Ignore.
+ */
+ if (pc->lengthComponentIdent > 0)
+ break;
+ /* Fall through */
+ case 2:
+ p = to;
+ *p++ = '/';
break;
case 3:
memcpy(p, "../", 3);