From: Chuck Lever <chuck.lever@oracle.com>
To: Benjamin Coddington <bcodding@redhat.com>
Cc: trond.myklebust@hammerspace.com,
Anna Schumaker <anna.schumaker@netapp.com>,
tibbs@math.uh.edu,
Linux NFS Mailing List <linux-nfs@vger.kernel.org>,
Bruce Fields <bfields@fieldses.org>,
km@cm4all.com
Subject: Re: [PATCH V3 1/2] SUNRPC: Fix buffer handling of GSS MIC without slack
Date: Mon, 16 Sep 2019 10:43:07 -0400 [thread overview]
Message-ID: <F8C53DD2-DB69-4660-943B-1AE059F69CFF@oracle.com> (raw)
In-Reply-To: <dad661c66dcbfb67714253d55d826ff126e53f50.1568635163.git.bcodding@redhat.com>
> On Sep 16, 2019, at 7:59 AM, Benjamin Coddington <bcodding@redhat.com> wrote:
>
> The GSS Message Integrity Check data for krb5i may lie partially in the XDR
> reply buffer's pages and tail. If so, we try to copy the entire MIC into
> free space in the tail. But as the estimations of the slack space required
> for authentication and verification have improved there may be less free
> space in the tail to complete this copy -- see commit 2c94b8eca1a2
> ("SUNRPC: Use au_rslack when computing reply buffer size"). In fact, there
> may only be room in the tail for a single copy of the MIC, and not part of
> the MIC and then another complete copy.
>
> The real world failure reported is that `ls` of a directory on NFS may
> sometimes return -EIO, which can be traced back to xdr_buf_read_netobj()
> failing to find available free space in the tail to copy the MIC.
>
> Fix this by checking for the case of the MIC crossing the boundaries of
> head, pages, and tail. If so, shift the buffer until the MIC is contained
> completely within the pages or tail. This allows the remainder of the
> function to create a sub buffer that directly address the complete MIC.
>
> Signed-off-by: Benjamin Coddington <bcodding@redhat.com>
> Cc: stable@vger.kernel.org # v5.1
Reviewed-by: Chuck Lever <chuck.lever@oracle.com>
> ---
> net/sunrpc/xdr.c | 27 ++++++++++++++++++---------
> 1 file changed, 18 insertions(+), 9 deletions(-)
>
> diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c
> index 48c93b9e525e..b256806d69cd 100644
> --- a/net/sunrpc/xdr.c
> +++ b/net/sunrpc/xdr.c
> @@ -1237,16 +1237,29 @@ xdr_encode_word(struct xdr_buf *buf, unsigned int base, u32 obj)
> EXPORT_SYMBOL_GPL(xdr_encode_word);
>
> /* If the netobj starting offset bytes from the start of xdr_buf is contained
> - * entirely in the head or the tail, set object to point to it; otherwise
> - * try to find space for it at the end of the tail, copy it there, and
> - * set obj to point to it. */
> + * entirely in the head, pages, or tail, set object to point to it; otherwise
> + * shift the buffer until it is contained entirely within the pages or tail.
> + */
> int xdr_buf_read_netobj(struct xdr_buf *buf, struct xdr_netobj *obj, unsigned int offset)
> {
> struct xdr_buf subbuf;
> + unsigned int boundary;
>
> if (xdr_decode_word(buf, offset, &obj->len))
> return -EFAULT;
> - if (xdr_buf_subsegment(buf, &subbuf, offset + 4, obj->len))
> + offset += 4;
> +
> + /* Is the obj partially in the head? */
> + boundary = buf->head[0].iov_len;
> + if (offset < boundary && (offset + obj->len) > boundary)
> + xdr_shift_buf(buf, boundary - offset);
> +
> + /* Is the obj partially in the pages? */
> + boundary += buf->page_len;
> + if (offset < boundary && (offset + obj->len) > boundary)
> + xdr_shrink_pagelen(buf, boundary - offset);
> +
> + if (xdr_buf_subsegment(buf, &subbuf, offset, obj->len))
> return -EFAULT;
>
> /* Is the obj contained entirely in the head? */
> @@ -1258,11 +1271,7 @@ int xdr_buf_read_netobj(struct xdr_buf *buf, struct xdr_netobj *obj, unsigned in
> if (subbuf.tail[0].iov_len == obj->len)
> return 0;
>
> - /* use end of tail as storage for obj:
> - * (We don't copy to the beginning because then we'd have
> - * to worry about doing a potentially overlapping copy.
> - * This assumes the object is at most half the length of the
> - * tail.) */
> + /* Find a contiguous area in @buf to hold all of @obj */
> if (obj->len > buf->buflen - buf->len)
> return -ENOMEM;
> if (buf->tail[0].iov_len != 0)
> --
> 2.20.1
>
--
Chuck Lever
prev parent reply other threads:[~2019-09-16 14:43 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-16 11:59 [PATCH V3 1/2] SUNRPC: Fix buffer handling of GSS MIC without slack Benjamin Coddington
2019-09-16 11:59 ` [PATCH V3 2/2] SUNRPC: Rename xdr_buf_read_netobj to xdr_buf_read_mic Benjamin Coddington
2019-09-16 14:43 ` Chuck Lever [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=F8C53DD2-DB69-4660-943B-1AE059F69CFF@oracle.com \
--to=chuck.lever@oracle.com \
--cc=anna.schumaker@netapp.com \
--cc=bcodding@redhat.com \
--cc=bfields@fieldses.org \
--cc=km@cm4all.com \
--cc=linux-nfs@vger.kernel.org \
--cc=tibbs@math.uh.edu \
--cc=trond.myklebust@hammerspace.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).