From patchwork Sat Feb 18 18:18:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9581167 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CFB2D6043A for ; Sat, 18 Feb 2017 18:18:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C10E527B13 for ; Sat, 18 Feb 2017 18:18:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B592028799; Sat, 18 Feb 2017 18:18:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2361827B13 for ; Sat, 18 Feb 2017 18:18:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753474AbdBRSSP (ORCPT ); Sat, 18 Feb 2017 13:18:15 -0500 Received: from mail-it0-f68.google.com ([209.85.214.68]:34483 "EHLO mail-it0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753473AbdBRSSO (ORCPT ); Sat, 18 Feb 2017 13:18:14 -0500 Received: by mail-it0-f68.google.com with SMTP id r141so6741907ita.1 for ; Sat, 18 Feb 2017 10:18:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=+KZbtcxO+QuEGyJMPDy4xgqIZ7A6V4zDXjVzH5vNvGo=; b=RbOqDLbzQ3of1Rd25tGO8wIeE9kJnYmdWvoV8PDbwhkhQ0J4DX3ohTcLir8yksGRmH r2aCsWEi5SKnrPlael/gq3HnYNC9Q2e88qBw7cCt9mDDO6avMw+NSOEpmDxzmFWcNUq2 yP4hqQjYS0kVq1W2u5X6d7OZ4h8BgktTZ8b6jir+NUPPFBS6Qe/yCTsmO+vE4O22svjl uHGlj/Y3IXHPl1QbyPqM7nbq5o+l3f24jw022e42SqwspJUaPMN0mUUZG6RU2QOkjuOl PvhBaDzTVn0mjhpeENsVJrTy8z1uUd8I8lojJbJHdS6SR8eX5hZgDKxYbCwMkO2HDu2r bXtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=+KZbtcxO+QuEGyJMPDy4xgqIZ7A6V4zDXjVzH5vNvGo=; b=rI3DUD8ZxS7utxSVkcYQgVxsSRN6WoCKfX91rDiYLVDxUaZUaSPmY4N1pHRbY7xKYl rjFK8za6hxVl2usbw9qi+fwBs4Vfh1pO33AKzxLQH4o08JLK0wG2CP9dzBqxi4MJ61Fc 8Tzazi2nLO7iqZ/B4dfphoFusnsXZy+CGWyfO+XFkW6K4HYXvne6ME9cM+hgLjHjOAsw 6WlfPLNn2QVIKmmCNULvymN15AC5jlTZlhmBRW7EMWTVD3WGqyE5adSfFl8gLzGHOp3M sypmNblpWn8Tgr9GFEVRztWjvHNt+77m8AgsFhMw4eQ/RL2i8tMAe2MiImi6us3UVPJS HnbQ== X-Gm-Message-State: AMke39lRWSQ1TMuyCkN6xfQTRta4ToSkNDjCObFTV8JOnR+XsrkUcUJvqE7zE4h5+KqpWA== X-Received: by 10.36.64.70 with SMTP id n67mr11034915ita.21.1487441893046; Sat, 18 Feb 2017 10:18:13 -0800 (PST) Received: from localhost.localdomain ([50.124.63.84]) by smtp.gmail.com with ESMTPSA id m6sm6738193ioa.57.2017.02.18.10.18.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 18 Feb 2017 10:18:12 -0800 (PST) From: Trond Myklebust To: Anna Schumaker Cc: linux-nfs@vger.kernel.org Subject: [PATCH v2 2/4] NFSv4: Replace ad-hoc xdr encode/decode helpers with xdr_stream_* generics Date: Sat, 18 Feb 2017 13:18:04 -0500 Message-Id: <20170218181806.25712-3-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170218181806.25712-2-trond.myklebust@primarydata.com> References: <20170218181806.25712-1-trond.myklebust@primarydata.com> <20170218181806.25712-2-trond.myklebust@primarydata.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Trond Myklebust --- fs/nfs/callback_xdr.c | 8 ++---- fs/nfs/flexfilelayout/flexfilelayout.c | 5 +--- fs/nfs/nfs4xdr.c | 52 ++++++++++------------------------ 3 files changed, 18 insertions(+), 47 deletions(-) diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c index eb094c6011d8..e732a65db546 100644 --- a/fs/nfs/callback_xdr.c +++ b/fs/nfs/callback_xdr.c @@ -582,12 +582,8 @@ static __be32 decode_notify_lock_args(struct svc_rqst *rqstp, struct xdr_stream static __be32 encode_string(struct xdr_stream *xdr, unsigned int len, const char *str) { - __be32 *p; - - p = xdr_reserve_space(xdr, 4 + len); - if (unlikely(p == NULL)) - return htonl(NFS4ERR_RESOURCE); - xdr_encode_opaque(p, str, len); + if (unlikely(xdr_stream_encode_opaque(xdr, str, len) < 0)) + return cpu_to_be32(NFS4ERR_RESOURCE); return 0; } diff --git a/fs/nfs/flexfilelayout/flexfilelayout.c b/fs/nfs/flexfilelayout/flexfilelayout.c index 42e3e9daa328..471efdc2589d 100644 --- a/fs/nfs/flexfilelayout/flexfilelayout.c +++ b/fs/nfs/flexfilelayout/flexfilelayout.c @@ -1966,10 +1966,7 @@ static int ff_layout_encode_ioerr(struct xdr_stream *xdr, static void encode_opaque_fixed(struct xdr_stream *xdr, const void *buf, size_t len) { - __be32 *p; - - p = xdr_reserve_space(xdr, len); - xdr_encode_opaque_fixed(p, buf, len); + WARN_ON_ONCE(xdr_stream_encode_opaque_fixed(xdr, buf, len) < 0); } static void diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c index e9255cb453e6..62ff0ff19880 100644 --- a/fs/nfs/nfs4xdr.c +++ b/fs/nfs/nfs4xdr.c @@ -924,34 +924,22 @@ static __be32 *reserve_space(struct xdr_stream *xdr, size_t nbytes) static void encode_opaque_fixed(struct xdr_stream *xdr, const void *buf, size_t len) { - __be32 *p; - - p = xdr_reserve_space(xdr, len); - xdr_encode_opaque_fixed(p, buf, len); + WARN_ON_ONCE(xdr_stream_encode_opaque_fixed(xdr, buf, len) < 0); } static void encode_string(struct xdr_stream *xdr, unsigned int len, const char *str) { - __be32 *p; - - p = reserve_space(xdr, 4 + len); - xdr_encode_opaque(p, str, len); + WARN_ON_ONCE(xdr_stream_encode_opaque(xdr, str, len) < 0); } static void encode_uint32(struct xdr_stream *xdr, u32 n) { - __be32 *p; - - p = reserve_space(xdr, 4); - *p = cpu_to_be32(n); + WARN_ON_ONCE(xdr_stream_encode_u32(xdr, n) < 0); } static void encode_uint64(struct xdr_stream *xdr, u64 n) { - __be32 *p; - - p = reserve_space(xdr, 8); - xdr_encode_hyper(p, n); + WARN_ON_ONCE(xdr_stream_encode_u64(xdr, n) < 0); } static void encode_nfs4_seqid(struct xdr_stream *xdr, @@ -3062,20 +3050,13 @@ static void print_overflow_msg(const char *func, const struct xdr_stream *xdr) static int decode_opaque_inline(struct xdr_stream *xdr, unsigned int *len, char **string) { - __be32 *p; - - p = xdr_inline_decode(xdr, 4); - if (unlikely(!p)) - goto out_overflow; - *len = be32_to_cpup(p); - p = xdr_inline_decode(xdr, *len); - if (unlikely(!p)) - goto out_overflow; - *string = (char *)p; + ssize_t ret = xdr_stream_decode_opaque_inline(xdr, (void **)string); + if (unlikely(ret < 0)) { + print_overflow_msg(__func__, xdr); + return -EIO; + } + *len = ret; return 0; -out_overflow: - print_overflow_msg(__func__, xdr); - return -EIO; } static int decode_compound_hdr(struct xdr_stream *xdr, struct compound_hdr *hdr) @@ -4294,15 +4275,12 @@ static int decode_access(struct xdr_stream *xdr, u32 *supported, u32 *access) static int decode_opaque_fixed(struct xdr_stream *xdr, void *buf, size_t len) { - __be32 *p; - - p = xdr_inline_decode(xdr, len); - if (likely(p)) { - memcpy(buf, p, len); - return 0; + ssize_t ret = xdr_stream_decode_opaque_fixed(xdr, buf, len); + if (unlikely(ret < 0)) { + print_overflow_msg(__func__, xdr); + return -EIO; } - print_overflow_msg(__func__, xdr); - return -EIO; + return 0; } static int decode_stateid(struct xdr_stream *xdr, nfs4_stateid *stateid)