Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7E988C282D8 for ; Fri, 1 Feb 2019 19:58:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4CFDB218AF for ; Fri, 1 Feb 2019 19:58:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="danHI+6K" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730301AbfBAT6Q (ORCPT ); Fri, 1 Feb 2019 14:58:16 -0500 Received: from mail-it1-f194.google.com ([209.85.166.194]:39436 "EHLO mail-it1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730292AbfBAT6Q (ORCPT ); Fri, 1 Feb 2019 14:58:16 -0500 Received: by mail-it1-f194.google.com with SMTP id a6so11590638itl.4 for ; Fri, 01 Feb 2019 11:58:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:from:to:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-transfer-encoding; bh=nWFtR97KrWdZ2uD+S1RLuJ9Khn0bvVwiQUH+Q4WmpOQ=; b=danHI+6KV8Tah+DEOjUCu1pWett1eTVbuSs+/rYFE29+7gOIrHs9PB8V9QmcCd/yBX LNjT79QSGgSOBTD50A8t9HG2AbnGR2LwqP0QfBp+ZtqMhMEJGtF55BxkgEkqUDbJ/QiZ DD7bRBb9VX7sAESzQkJm0BqEPk/QI+M9iPG7jd7YSdL8ACIGb1ypjnzHlol3C+AGdKKB bKTDqcusTP1s0PIjeVTTpDwJ4anwnTyIS7+aDvGr4wWeUSaaHRw7M58TBGnL0LQK4N+p ihc//kkhJPrYoFFKNo7Gx6W+f2DzF5A/kWUq+PEHzltmdiyPNeJVx59R8HlbPPJK/TI6 cU+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:subject:from:to:cc:date:message-id :in-reply-to:references:user-agent:mime-version :content-transfer-encoding; bh=nWFtR97KrWdZ2uD+S1RLuJ9Khn0bvVwiQUH+Q4WmpOQ=; b=QYYCjgLYhlL70A1eE9yeCluV36W7N1RAYUExiYpwJFk8EAgeJ8sNs0R8phO8jmtnmd 9rGtYfNQXP0mlZ7acFoKXeRjW+CMdyNCdwIm+Fzpq1WONF81EHuz2Wd13fjLc5zkp99I Vpk2jHo7pjFkyj0SgxR0LcCyRRjl4GC3e3SSBB2U/VPtaKdQqVYu4vKXP167Ty97db6G EbzSWfb9pzj7ds+0PT/pcYrjKoppOD9mqFVF05Ev3JW1v7bs+4EnK4nUdEQ2H4f7Dn3s EX6+XQasiyWExWDDKyjsRwCfRycOsyI7BaGSmwjpxISdmPEr44yAFO9Y9alR+cO57lXT SsLg== X-Gm-Message-State: AHQUAubCsJKn7/X5x5BN35kit9R0ZNRhV/nzE0qTTfLErMLHAXU4j9po zcI9T43jd8ESfqpz5Qt9w5U= X-Google-Smtp-Source: AHgI3IYxglUVG92EBBftW1X1HwAIaOJL4miD6sxuOESUxmZkTTb45mLJH5EoyXkM8Tr546yXqBhQvA== X-Received: by 2002:a24:10cc:: with SMTP id 195mr2349452ity.178.1549051095552; Fri, 01 Feb 2019 11:58:15 -0800 (PST) Received: from gateway.1015granger.net (c-68-61-232-219.hsd1.mi.comcast.net. [68.61.232.219]) by smtp.gmail.com with ESMTPSA id v4sm2838610itv.20.2019.02.01.11.58.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 01 Feb 2019 11:58:15 -0800 (PST) Received: from manet.1015granger.net (manet.1015granger.net [192.168.1.51]) by gateway.1015granger.net (8.14.7/8.14.7) with ESMTP id x11JwEe2008720; Fri, 1 Feb 2019 19:58:14 GMT Subject: [PATCH RFC 09/10] SUNRPC: Remove xdr_buf_trim() From: Chuck Lever To: linux-nfs@vger.kernel.org Cc: simo@redhat.com Date: Fri, 01 Feb 2019 14:58:14 -0500 Message-ID: <20190201195814.11389.4023.stgit@manet.1015granger.net> In-Reply-To: <20190201195538.11389.96106.stgit@manet.1015granger.net> References: <20190201195538.11389.96106.stgit@manet.1015granger.net> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org The key action of xdr_buf_trim() is that it shortens buf->len, the length of the xdr_buf' content. The other actions -- shortening the head, pages, and tail components -- are actually not necessary. In some cases, changing the size of those components corrupts the RPC message contained in the buffer. Signed-off-by: Chuck Lever --- include/linux/sunrpc/xdr.h | 1 - net/sunrpc/auth_gss/gss_krb5_wrap.c | 8 ++++--- net/sunrpc/auth_gss/svcauth_gss.c | 2 +- net/sunrpc/xdr.c | 41 ----------------------------------- 4 files changed, 6 insertions(+), 46 deletions(-) diff --git a/include/linux/sunrpc/xdr.h b/include/linux/sunrpc/xdr.h index 69161cb..4ae398c 100644 --- a/include/linux/sunrpc/xdr.h +++ b/include/linux/sunrpc/xdr.h @@ -183,7 +183,6 @@ static inline __be32 *xdr_encode_array(__be32 *p, const void *s, unsigned int le extern void xdr_shift_buf(struct xdr_buf *, size_t); extern void xdr_buf_from_iov(struct kvec *, struct xdr_buf *); extern int xdr_buf_subsegment(struct xdr_buf *, struct xdr_buf *, unsigned int, unsigned int); -extern void xdr_buf_trim(struct xdr_buf *, unsigned int); extern int xdr_buf_read_netobj(struct xdr_buf *, struct xdr_netobj *, unsigned int); extern int read_bytes_from_xdr_buf(struct xdr_buf *, unsigned int, void *, unsigned int); extern int write_bytes_to_xdr_buf(struct xdr_buf *, unsigned int, void *, unsigned int); diff --git a/net/sunrpc/auth_gss/gss_krb5_wrap.c b/net/sunrpc/auth_gss/gss_krb5_wrap.c index 5cdde6c..14a0aff 100644 --- a/net/sunrpc/auth_gss/gss_krb5_wrap.c +++ b/net/sunrpc/auth_gss/gss_krb5_wrap.c @@ -570,14 +570,16 @@ static void rotate_left(u32 base, struct xdr_buf *buf, unsigned int shift) */ movelen = min_t(unsigned int, buf->head[0].iov_len, buf->len); movelen -= offset + GSS_KRB5_TOK_HDR_LEN + headskip; - BUG_ON(offset + GSS_KRB5_TOK_HDR_LEN + headskip + movelen > - buf->head[0].iov_len); + if (offset + GSS_KRB5_TOK_HDR_LEN + headskip + movelen > + buf->head[0].iov_len) + return GSS_S_FAILURE; memmove(ptr, ptr + GSS_KRB5_TOK_HDR_LEN + headskip, movelen); buf->head[0].iov_len -= GSS_KRB5_TOK_HDR_LEN + headskip; buf->len -= GSS_KRB5_TOK_HDR_LEN + headskip; /* Trim off the trailing "extra count" and checksum blob */ - xdr_buf_trim(buf, ec + GSS_KRB5_TOK_HDR_LEN + tailskip); + buf->len -= ec + GSS_KRB5_TOK_HDR_LEN + tailskip; + return GSS_S_COMPLETE; } diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c index 152790e..f1aabab 100644 --- a/net/sunrpc/auth_gss/svcauth_gss.c +++ b/net/sunrpc/auth_gss/svcauth_gss.c @@ -896,7 +896,7 @@ u32 svcauth_gss_flavor(struct auth_domain *dom) if (svc_getnl(&buf->head[0]) != seq) goto out; /* trim off the mic and padding at the end before returning */ - xdr_buf_trim(buf, round_up_to_quad(mic.len) + 4); + buf->len -= 4 + round_up_to_quad(mic.len); stat = 0; out: kfree(mic.data); diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c index 5f0aa53..4bce619 100644 --- a/net/sunrpc/xdr.c +++ b/net/sunrpc/xdr.c @@ -1139,47 +1139,6 @@ void xdr_enter_page(struct xdr_stream *xdr, unsigned int len) } EXPORT_SYMBOL_GPL(xdr_buf_subsegment); -/** - * xdr_buf_trim - lop at most "len" bytes off the end of "buf" - * @buf: buf to be trimmed - * @len: number of bytes to reduce "buf" by - * - * Trim an xdr_buf by the given number of bytes by fixing up the lengths. Note - * that it's possible that we'll trim less than that amount if the xdr_buf is - * too small, or if (for instance) it's all in the head and the parser has - * already read too far into it. - */ -void xdr_buf_trim(struct xdr_buf *buf, unsigned int len) -{ - size_t cur; - unsigned int trim = len; - - if (buf->tail[0].iov_len) { - cur = min_t(size_t, buf->tail[0].iov_len, trim); - buf->tail[0].iov_len -= cur; - trim -= cur; - if (!trim) - goto fix_len; - } - - if (buf->page_len) { - cur = min_t(unsigned int, buf->page_len, trim); - buf->page_len -= cur; - trim -= cur; - if (!trim) - goto fix_len; - } - - if (buf->head[0].iov_len) { - cur = min_t(size_t, buf->head[0].iov_len, trim); - buf->head[0].iov_len -= cur; - trim -= cur; - } -fix_len: - buf->len -= (len - trim); -} -EXPORT_SYMBOL_GPL(xdr_buf_trim); - static void __read_bytes_from_xdr_buf(struct xdr_buf *subbuf, void *obj, unsigned int len) { unsigned int this_len;