linux-kernel - Re: [PATCH v3 02/10] fs/ntfs3: Add initialization of super block

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 for Android: free password hash cracker in your pocket

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

Message-ID: <20200904120625.2af76ebfnacbzwug@pali>
Date:   Fri, 4 Sep 2020 14:06:25 +0200
From:   Pali Rohár <pali@...nel.org>
To:     Konstantin Komarov <almaz.alexandrovich@...agon-software.com>
Cc:     linux-fsdevel@...r.kernel.org, viro@...iv.linux.org.uk,
        linux-kernel@...r.kernel.org, dsterba@...e.cz, aaptel@...e.com,
        willy@...radead.org, rdunlap@...radead.org, joe@...ches.com,
        mark@...mstone.com
Subject: Re: [PATCH v3 02/10] fs/ntfs3: Add initialization of super block

Hello Konstantin!

On Friday 28 August 2020 07:39:30 Konstantin Komarov wrote:
> +	if (nls_name[0]) {
> +		sbi->nls = load_nls(nls_name);
> +		if (!sbi->nls) {
> +			ntfs_printk(sb, KERN_ERR "failed to load \"%s\"",
> +				    nls_name);
> +			return -EINVAL;
> +		}
> +	} else {
> +		sbi->nls = load_nls_default();
> +		if (!sbi->nls) {
> +			ntfs_printk(sb, KERN_ERR "failed to load default nls");
> +			return -EINVAL;
> +		}
> +	}
> +
> +	if (!strcmp(sbi->nls->charset, "utf8")) {
> +		/*use utf16s_to_utf8s/utf8s_to_utf16s instead of nls*/
> +		unload_nls(sbi->nls);
> +		sbi->nls = NULL;
> +	}

You can slightly simplify this code to omit calling load_nls() for UTF-8. E.g.:

    if (strcmp(nls_name[0] ? nls_name : CONFIG_NLS_DEFAULT, "utf8") == 0) {
        /* For UTF-8 use utf16s_to_utf8s/utf8s_to_utf16s instead of nls */
        sbi->nls = NULL;
    } else if (nls_name) {
        sbi->nls = load_nls(nls_name);
        if (!sbi->nls) {
            /* handle error */
        }
    } else {
        sbi->nls = load_nls_default();
        if (!sbi->nls) {
            /* handle error */
        }
    }