linux-kernel - Re: [PATCH] CIFS: return correct errors when pinning memory failed for direct I/O

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] [day] [month] [year] [list]

Message-ID: <CAH2r5muQVqOy1c0Mk0BBHBND_7oqqhyXUwGVp1M0ek7+onLAJw@mail.gmail.com>
Date:   Mon, 17 Dec 2018 23:07:47 -0600
From:   Steve French <smfrench@...il.com>
To:     Long Li <longli@...rosoft.com>
Cc:     Steve French <sfrench@...ba.org>,
        CIFS <linux-cifs@...r.kernel.org>,
        samba-technical <samba-technical@...ts.samba.org>,
        LKML <linux-kernel@...r.kernel.org>, linux-rdma@...r.kernel.org,
        Stable <stable@...r.kernel.org>, jencce.kernel@...il.com
Subject: Re: [PATCH] CIFS: return correct errors when pinning memory failed
 for direct I/O

merged into cifs-2.6.git for-next

On Sun, Dec 16, 2018 at 4:44 PM Long Li <longli@...uxonhyperv.com> wrote:
>
> From: Long Li <longli@...rosoft.com>
>
> When pinning memory failed, we should return the correct error code and
> rewind the SMB credits.
>
> Reported-by: Murphy Zhou <jencce.kernel@...il.com>
> Signed-off-by: Long Li <longli@...rosoft.com>
> Cc: stable@...r.kernel.org
> Cc: Murphy Zhou <jencce.kernel@...il.com>
> ---
>  fs/cifs/file.c | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/fs/cifs/file.c b/fs/cifs/file.c
> index c9bc56b..3467351 100644
> --- a/fs/cifs/file.c
> +++ b/fs/cifs/file.c
> @@ -2630,6 +2630,9 @@ cifs_write_from_iter(loff_t offset, size_t len, struct iov_iter *from,
>                                         result, from->type,
>                                         from->iov_offset, from->count);
>                                 dump_stack();
> +
> +                               rc = result;
> +                               add_credits_and_wake_if(server, credits, 0);
>                                 break;
>                         }
>                         cur_len = (size_t)result;
> @@ -3313,13 +3316,16 @@ cifs_send_async_read(loff_t offset, size_t len, struct cifsFileInfo *open_file,
>                                         cur_len, &start);
>                         if (result < 0) {
>                                 cifs_dbg(VFS,
> -                                       "couldn't get user pages (cur_len=%zd)"
> +                                       "couldn't get user pages (rc=%zd)"
>                                         " iter type %d"
>                                         " iov_offset %zd count %zd\n",
>                                         result, direct_iov.type,
>                                         direct_iov.iov_offset,
>                                         direct_iov.count);
>                                 dump_stack();
> +
> +                               rc = result;
> +                               add_credits_and_wake_if(server, credits, 0);
>                                 break;
>                         }
>                         cur_len = (size_t)result;
> --
> 2.7.4
>


-- 
Thanks,

Steve