Re: [PATCH] CIFS: check new file size when extending file by fallocate

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



generates a warning (sparse) when compiled - can you fix and resubmit
(can also add Ronnie's acked if you want)

  CHECK   /home/smfrench/cifs-2.6/fs/cifs/smb2ops.c
/home/smfrench/cifs-2.6/fs/cifs/smb2ops.c:3259:46: warning: incorrect
type in argument 2 (different base types)
/home/smfrench/cifs-2.6/fs/cifs/smb2ops.c:3259:46:    expected long
long [usertype] offset
/home/smfrench/cifs-2.6/fs/cifs/smb2ops.c:3259:46:    got restricted
__le64 [assigned] [usertype] eof
  CC [M]  /home/smfrench/cifs-2.6/fs/cifs/smb2ops.o

On Tue, Mar 17, 2020 at 8:57 PM Murphy Zhou <jencce.kernel@xxxxxxxxx> wrote:
>
> xfstests generic/228 checks if fallocate respects RLIMIT_FSIZE.
> After fallocate mode 0 extending enabled, cifs can hit this failure.
> Fix this by checking the new file size with the vfs helper, which
> checks with RLIMIT_FSIZE(ulimit -f) and s_maxbytes.
>
> This patch has been tested by LTP/xfstests aginst samba and
> Windows server. No new issue was found.
>
> Signed-off-by: Murphy Zhou <jencce.kernel@xxxxxxxxx>
> ---
>  fs/cifs/smb2ops.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
> index c31e84ee3c39..48bbbb68540d 100644
> --- a/fs/cifs/smb2ops.c
> +++ b/fs/cifs/smb2ops.c
> @@ -3246,10 +3246,14 @@ static long smb3_simple_falloc(struct file *file, struct cifs_tcon *tcon,
>          * Extending the file
>          */
>         if ((keep_size == false) && i_size_read(inode) < off + len) {
> +               eof = cpu_to_le64(off + len);
> +               rc = inode_newsize_ok(inode, eof);
> +               if (rc)
> +                       goto out;
> +
>                 if ((cifsi->cifsAttrs & FILE_ATTRIBUTE_SPARSE_FILE) == 0)
>                         smb2_set_sparse(xid, tcon, cfile, inode, false);
>
> -               eof = cpu_to_le64(off + len);
>                 rc = SMB2_set_eof(xid, tcon, cfile->fid.persistent_fid,
>                                   cfile->fid.volatile_fid, cfile->pid, &eof);
>                 if (rc == 0) {
> --
> 2.20.1



-- 
Thanks,

Steve



[Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux