Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <b3d04e78-c6d0-17ec-620f-5125e645dd00@paragon-software.com>
Date:   Fri, 30 Sep 2022 18:41:53 +0300
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.11.0
Subject: Re: [PATCH} ntfs3: fix [df]mask display in /proc/mounts
Content-Language: en-US
To:     =?UTF-8?Q?Marc_Aur=c3=a8le_La_France?= <tsi@tuyoix.net>,
        <ntfs3@lists.linux.dev>, <linux-kernel@vger.kernel.org>
References: <d3337d95-201c-43bd-3b37-4fd9e654d821@tuyoix.net>
From:   Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
In-Reply-To: <d3337d95-201c-43bd-3b37-4fd9e654d821@tuyoix.net>
Content-Type: text/plain; charset="UTF-8"; format=flowed
Content-Transfer-Encoding: 8bit
Precedence: bulk


On 8/10/22 23:28, Marc Aurèle La France wrote:
> ntfs3's dmask and fmask mount options are 16-bit quantities but are displayed
> as 1-extended 32-bit values in /proc/mounts.  Fix this by circumventing
> integer promotion.
> 
> This change is not eligible for stable@.
> 
> Please Reply-To-All.
> 
> Thanks and have a great day.
> 
> Marc.
> 
> Signed-off-by: Marc Aurèle La France <tsi@tuyoix.net>
> 
> diff -aNpRruz -X /etc/diff.excludes linux-5.17.1/fs/ntfs3/super.c devel-5.17.1/fs/ntfs3/super.c
> --- linux-5.17.1/fs/ntfs3/super.c	2022-03-28 02:03:22.000000000 -0600
> +++ devel-5.17.1/fs/ntfs3/super.c	2022-03-28 07:14:10.799008309 -0600
> @@ -518,9 +518,9 @@ static int ntfs_show_options(struct seq_file *m, struct dentry *root)
>   	seq_printf(m, ",gid=%u",
>   		  from_kgid_munged(user_ns, opts->fs_gid));
>   	if (opts->fmask)
> -		seq_printf(m, ",fmask=%04o", ~opts->fs_fmask_inv);
> +		seq_printf(m, ",fmask=%04o", opts->fs_fmask_inv ^ 0xffff);
>   	if (opts->dmask)
> -		seq_printf(m, ",dmask=%04o", ~opts->fs_dmask_inv);
> +		seq_printf(m, ",dmask=%04o", opts->fs_dmask_inv ^ 0xffff);
>   	if (opts->nls)
>   		seq_printf(m, ",iocharset=%s", opts->nls->charset);
>   	else

Thanks for patch, applied!