From mboxrd@z Thu Jan 1 00:00:00 1970 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=-13.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,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 7DB5DC56202 for ; Fri, 20 Nov 2020 20:38:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 181D72223F for ; Fri, 20 Nov 2020 20:38:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="hU7co9au" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731536AbgKTUiK (ORCPT ); Fri, 20 Nov 2020 15:38:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33132 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731533AbgKTUiK (ORCPT ); Fri, 20 Nov 2020 15:38:10 -0500 Received: from mail-qk1-x743.google.com (mail-qk1-x743.google.com [IPv6:2607:f8b0:4864:20::743]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BC65DC0613CF for ; Fri, 20 Nov 2020 12:38:09 -0800 (PST) Received: by mail-qk1-x743.google.com with SMTP id r7so10218806qkf.3 for ; Fri, 20 Nov 2020 12:38:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:from:to:date:message-id:in-reply-to:references :user-agent:mime-version:content-transfer-encoding; bh=ermSJ/DR3rVl9OtAsOrxcTZAU4uf5dwIk/aNR9PjGuE=; b=hU7co9auB/ycvzCk4bBbaPtA+7UcwyQJqN8LGvm7suvY7uKvNquBrHSung56aRpQa4 fG2RFM3Xwg0i4u3Y1utygEu1pdddZL4SfqKhio5kDvC7vH0DqxwMuyhPMw2PZ73yflMt 3VnwISJxCaN856AqAd5C+567oraSA0FZIvck3/I9hw8panD0Ddss+J9luHQWmHIAJ7c7 p+lBIJihJRtxglFy/epikdH4O4xD4GT5E5Anljc+fe32lzbu9e50c/XOmy00DYmLGL6h 92guJ5Hyjgxi1zs4eSiqyKKkjnd2u0C3l8zkyTUC6zKv9qatEgCKALpiWikYRd38clxr 2mGg== 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:date:message-id :in-reply-to:references:user-agent:mime-version :content-transfer-encoding; bh=ermSJ/DR3rVl9OtAsOrxcTZAU4uf5dwIk/aNR9PjGuE=; b=GxZRH52+Kk5kiYEwCbeeSezkIh67vhyjqCQK2H38IkmfsGXYoZsdzmXabztKMFqOOh 9nEpHpaQ9VimP+hsB4eg6S7qjF+2sjIc7sYLgBcgwK4MxnCDJW229Gl/TD1meapu5Cxu xrxDTARj1AJjLSDdp+asuTW21r63nh7aVYnLlzKDEScMedk86BDhIyimDiMpPXW81UGF SaKWqskvoTrpvRdsTC4OR6OOW5F8F+UdY9ojZXd4E7ilbX6dFKeN1TvNdIPuFOheWXox HPpbxYoBoFGj8UJdcBFtPX+Wxt29Nt8k2Aee9UInEIpZf+M61z2qmMLoJuXs+3JxHySt pu5g== X-Gm-Message-State: AOAM532402Si6CuBuTMApKZK/G4E8k1yt07hOk8t5N6JdUdY0pKYZcOh Prz3bAgssQQZAaMGfzinr4vwKlUFY9g= X-Google-Smtp-Source: ABdhPJxBeF+vRXjcvEzLBpeKr20c419UeUFk5K3cBQMv2HDg4EwtHqb+Ja6gWVZjD8fkicQScX6fAg== X-Received: by 2002:a05:620a:14a5:: with SMTP id x5mr16919410qkj.263.1605904688654; Fri, 20 Nov 2020 12:38:08 -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 o15sm2597643qtw.64.2020.11.20.12.38.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 20 Nov 2020 12:38:08 -0800 (PST) Sender: Chuck Lever Received: from klimt.1015granger.net (klimt.1015granger.net [192.168.1.55]) by gateway.1015granger.net (8.14.7/8.14.7) with ESMTP id 0AKKc7DV029349 for ; Fri, 20 Nov 2020 20:38:07 GMT Subject: [PATCH v2 049/118] NFSD: Replace READ* macros in nfsd4_decode_write() From: Chuck Lever To: linux-nfs@vger.kernel.org Date: Fri, 20 Nov 2020 15:38:06 -0500 Message-ID: <160590468692.1340.6542502883753961142.stgit@klimt.1015granger.net> In-Reply-To: <160590425404.1340.8850646771948736468.stgit@klimt.1015granger.net> References: <160590425404.1340.8850646771948736468.stgit@klimt.1015granger.net> User-Agent: StGit/0.23-29-ga622f1 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Signed-off-by: Chuck Lever --- fs/nfsd/nfs4xdr.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index 69262f9ea5a5..65c34bb52d16 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -1341,22 +1341,23 @@ nfsd4_decode_verify(struct nfsd4_compoundargs *argp, struct nfsd4_verify *verify static __be32 nfsd4_decode_write(struct nfsd4_compoundargs *argp, struct nfsd4_write *write) { - DECODE_HEAD; + __be32 status; status = nfsd4_decode_stateid4(argp, &write->wr_stateid); if (status) return status; - READ_BUF(16); - p = xdr_decode_hyper(p, &write->wr_offset); - write->wr_stable_how = be32_to_cpup(p++); + if (xdr_stream_decode_u64(argp->xdr, &write->wr_offset) < 0) + return nfserr_bad_xdr; + if (xdr_stream_decode_u32(argp->xdr, &write->wr_stable_how) < 0) + return nfserr_bad_xdr; if (write->wr_stable_how > NFS_FILE_SYNC) - goto xdr_error; - write->wr_buflen = be32_to_cpup(p++); - + return nfserr_bad_xdr; + if (xdr_stream_decode_u32(argp->xdr, &write->wr_buflen) < 0) + return nfserr_bad_xdr; if (!xdr_stream_subsegment(argp->xdr, &write->wr_payload, write->wr_buflen)) - goto xdr_error; + return nfserr_bad_xdr; - DECODE_TAIL; + return nfs_ok; } static __be32