lkml.org 
[lkml]   [2002]   [Mar]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject(FORWARD) René Scharfe: [PATCH] MSDOS filesystem option mistreatment
    Date
    This seems correct.  Al?

    Rusty.
    --
    Anyone who quotes me in their sig is an idiot. -- Rusty Russell.

    ------- Forwarded Message

    Date: Tue, 12 Mar 2002 23:07:58 +0100
    From: René Scharfe <l.s.r@web.de>
    To: trivial@rustcorp.com.au
    Subject: [PATCH] MSDOS filesystem option mistreatment
    Message-Id: <20020312230758.243bb4cf.l.s.r@web.de>

    Hello,

    this fixes a longstanding buglet in kernels 2.4 and 2.5, where
    the MSDOS filesystem would ignore its 'check' mount option.

    René


    diff -ur linux-2.5.6/fs/msdos/namei.c linux-2.5.6-fat/fs/msdos/namei.c
    --- linux-2.5.6/fs/msdos/namei.c Wed Feb 20 19:49:06 2002
    +++ linux-2.5.6-fat/fs/msdos/namei.c Tue Mar 12 22:50:58 2002
    @@ -42,9 +42,10 @@
    /***** Formats an MS-DOS file name. Rejects invalid names. */
    static int msdos_format_name(const char *name,int len,
    char *res,struct fat_mount_options *opts)
    - /* conv is relaxed/normal/strict, name is proposed name,
    - * len is the length of the proposed name, res is the result name,
    - * dotsOK is if hidden files get dots.
    + /* name is the proposed name, len is its length, res is
    + * the resulting name, opts->name_check is either (r)elaxed,
    + * (n)ormal or (s)trict, opts->dotsOK allows dots at the
    + * beginning of name (for hidden files)
    */
    {
    char *walk;
    @@ -66,11 +67,11 @@
    for (walk = res; len && walk-res < 8; walk++) {
    c = *name++;
    len--;
    - if (opts->conversion != 'r' && strchr(bad_chars,c))
    + if (opts->name_check != 'r' && strchr(bad_chars,c))
    return -EINVAL;
    - if (opts->conversion == 's' && strchr(bad_if_strict(opts),c))
    + if (opts->name_check == 's' && strchr(bad_if_strict(opts),c))
    return -EINVAL;
    - if (c >= 'A' && c <= 'Z' && opts->conversion == 's')
    + if (c >= 'A' && c <= 'Z' && opts->name_check == 's')
    return -EINVAL;
    if (c < ' ' || c == ':' || c == '\\') return -EINVAL;
    /* 0xE5 is legal as a first character, but we must substitute 0x05 */
    @@ -83,7 +84,7 @@
    *walk = (!opts->nocase && c >= 'a' && c <= 'z') ? c-32 : c;
    }
    if (space) return -EINVAL;
    - if (opts->conversion == 's' && len && c != '.') {
    + if (opts->name_check == 's' && len && c != '.') {
    c = *name++;
    len--;
    if (c != '.') return -EINVAL;
    @@ -94,25 +95,25 @@
    while (len > 0 && walk-res < MSDOS_NAME) {
    c = *name++;
    len--;
    - if (opts->conversion != 'r' && strchr(bad_chars,c))
    + if (opts->name_check != 'r' && strchr(bad_chars,c))
    return -EINVAL;
    - if (opts->conversion == 's' &&
    + if (opts->name_check == 's' &&
    strchr(bad_if_strict(opts),c))
    return -EINVAL;
    if (c < ' ' || c == ':' || c == '\\')
    return -EINVAL;
    if (c == '.') {
    - if (opts->conversion == 's')
    + if (opts->name_check == 's')
    return -EINVAL;
    break;
    }
    - if (c >= 'A' && c <= 'Z' && opts->conversion == 's')
    + if (c >= 'A' && c <= 'Z' && opts->name_check == 's')
    return -EINVAL;
    space = c == ' ';
    *walk++ = (!opts->nocase && c >= 'a' && c <= 'z') ? c-32 : c;
    }
    if (space) return -EINVAL;
    - if (opts->conversion == 's' && len) return -EINVAL;
    + if (opts->name_check == 's' && len) return -EINVAL;
    }
    while (walk-res < MSDOS_NAME) *walk++ = ' ';
    if (!opts->atari)

    ------- End of Forwarded Message
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2005-03-22 13:21    [W:0.027 / U:3.140 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site