From da16ce3a6f2e32253b2b8d0fc1164c13ddc2730a Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 16 Jul 2009 12:47:15 +1000 Subject: [PATCH 3/3] FAT: Added FAT_NO_83NAME This patch adds a new flag field 'FAT_NO_83NAME' for FAT files. When this flag is set on an 8.3 FAT entry, both the MSDOS and VFAT filesystems will skip the entry. For MSDOS this makes the file inaccessible. For VFAT it makes the file only accessible by the long filename. Signed-off-by: Andrew Tridgell --- fs/fat/dir.c | 14 ++++++++++++++ include/linux/msdos_fs.h | 1 + 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/fs/fat/dir.c b/fs/fat/dir.c index 530b4ca..2d0ef72 100644 --- a/fs/fat/dir.c +++ b/fs/fat/dir.c @@ -384,6 +384,13 @@ parse_record: goto end_of_dir; } + /* + * The FAT_NO_83NAME flag is used to mark files + * created with no 8.3 short name + */ + if (de->lcase & FAT_NO_83NAME) + goto compare_longname; + memcpy(work, de->name, sizeof(de->name)); /* see namei.c, msdos_format_name */ if (work[0] == 0x05) @@ -428,6 +435,7 @@ parse_record: if (fat_name_match(sbi, name, name_len, bufname, len)) goto found; +compare_longname: if (nr_slots) { void *longname = unicode + FAT_MAX_UNI_CHARS; int size = PATH_MAX - FAT_MAX_UNI_SIZE; @@ -529,6 +537,8 @@ parse_record: if (de->attr != ATTR_EXT && IS_FREE(de->name)) goto record_end; } else { + if (de->lcase & FAT_NO_83NAME) + goto record_end; if ((de->attr & ATTR_VOLUME) || IS_FREE(de->name)) goto record_end; } @@ -934,6 +944,10 @@ int fat_scan(struct inode *dir, const unsigned char *name, sinfo->bh = NULL; while (fat_get_short_entry(dir, &sinfo->slot_off, &sinfo->bh, &sinfo->de) >= 0) { + /* skip files marked as having no 8.3 short name */ + if (sinfo->de->lcase & FAT_NO_83NAME) + continue; + if (!strncmp(sinfo->de->name, name, MSDOS_NAME)) { sinfo->slot_off -= sizeof(*sinfo->de); sinfo->nr_slots = 1; diff --git a/include/linux/msdos_fs.h b/include/linux/msdos_fs.h index 34066e6..12ba0ba 100644 --- a/include/linux/msdos_fs.h +++ b/include/linux/msdos_fs.h @@ -44,6 +44,7 @@ #define CASE_LOWER_BASE 8 /* base is lower case */ #define CASE_LOWER_EXT 16 /* extension is lower case */ +#define FAT_NO_83NAME 32 /* no 8.3 short filename for this file */ #define DELETED_FLAG 0xe5 /* marks file as deleted when in name[0] */ #define IS_FREE(n) (!*(n) || *(n) == DELETED_FLAG) -- 1.6.5.2