linux-kernel - Re: [PATCH] msdos fs: remove unsettable atari option

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <87ve12s849.fsf@duaron.myhome.or.jp>
Date:	Mon, 26 May 2008 00:42:29 +0900
From:	OGAWA Hirofumi <hirofumi@...l.parknet.co.jp>
To:	René Scharfe <rene.scharfe@...fire.ath.cx>
Cc:	linux-kernel@...r.kernel.org,
	Andrew Morton <akpm@...ux-foundation.org>
Subject: Re: [PATCH] msdos fs: remove unsettable atari option

René Scharfe <rene.scharfe@...fire.ath.cx> writes:

> It has been impossible to set the option 'atari' of the MSDOS filesystem
> for several years.  Since nobody seems to have missed it, let's remove
> its remains.
>
> Signed-off-by: Rene Scharfe <rene.scharfe@...fire.ath.cx>
> ---

Looks good to me. Thanks.

Acked-by: OGAWA Hirofumi <hirofumi@...l.parknet.co.jp>

>  fs/msdos/namei.c         |   18 ++++++------------
>  include/linux/msdos_fs.h |    1 -
>  2 files changed, 6 insertions(+), 13 deletions(-)
>
> diff --git a/fs/msdos/namei.c b/fs/msdos/namei.c
> index 05ff4f1..8240d22 100644
> --- a/fs/msdos/namei.c
> +++ b/fs/msdos/namei.c
> @@ -14,12 +14,7 @@
>  
>  /* Characters that are undesirable in an MS-DOS file name */
>  static unsigned char bad_chars[] = "*?<>|\"";
> -static unsigned char bad_if_strict_pc[] = "+=,; ";
> -/* GEMDOS is less restrictive */
> -static unsigned char bad_if_strict_atari[] = " ";
> -
> -#define bad_if_strict(opts) \
> -	((opts)->atari ? bad_if_strict_atari : bad_if_strict_pc)
> +static unsigned char bad_if_strict[] = "+=,; ";
>  
>  /***** Formats an MS-DOS file name. Rejects invalid names. */
>  static int msdos_format_name(const unsigned char *name, int len,
> @@ -40,21 +35,20 @@ static int msdos_format_name(const unsigned char *name, int len,
>  			/* Get rid of dot - test for it elsewhere */
>  			name++;
>  			len--;
> -		} else if (!opts->atari)
> +		} else
>  			return -EINVAL;
>  	}
>  	/*
> -	 * disallow names that _really_ start with a dot for MS-DOS,
> -	 * GEMDOS does not care
> +	 * disallow names that _really_ start with a dot
>  	 */
> -	space = !opts->atari;
> +	space = 1;
>  	c = 0;
>  	for (walk = res; len && walk - res < 8; walk++) {
>  		c = *name++;
>  		len--;
>  		if (opts->name_check != 'r' && strchr(bad_chars, c))
>  			return -EINVAL;
> -		if (opts->name_check == 's' && strchr(bad_if_strict(opts), c))
> +		if (opts->name_check == 's' && strchr(bad_if_strict, c))
>  			return -EINVAL;
>  		if (c >= 'A' && c <= 'Z' && opts->name_check == 's')
>  			return -EINVAL;
> @@ -94,7 +88,7 @@ static int msdos_format_name(const unsigned char *name, int len,
>  			if (opts->name_check != 'r' && strchr(bad_chars, c))
>  				return -EINVAL;
>  			if (opts->name_check == 's' &&
> -			    strchr(bad_if_strict(opts), c))
> +			    strchr(bad_if_strict, c))
>  				return -EINVAL;
>  			if (c < ' ' || c == ':' || c == '\\')
>  				return -EINVAL;
> diff --git a/include/linux/msdos_fs.h b/include/linux/msdos_fs.h
> index b03b274..ceb5d16 100644
> --- a/include/linux/msdos_fs.h
> +++ b/include/linux/msdos_fs.h
> @@ -208,7 +208,6 @@ struct fat_mount_options {
>  		 utf8:1,	  /* Use of UTF-8 character set (Default) */
>  		 unicode_xlate:1, /* create escape sequences for unhandled Unicode */
>  		 numtail:1,       /* Does first alias have a numeric '~1' type tail? */
> -		 atari:1,         /* Use Atari GEMDOS variation of MS-DOS fs */
>  		 flush:1,	  /* write things quickly */
>  		 nocase:1,	  /* Does this need case conversion? 0=need case conversion*/
>  		 usefree:1;	  /* Use free_clusters for FAT32 */
>

-- 
OGAWA Hirofumi <hirofumi@...l.parknet.co.jp>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/