From patchwork Sun Feb 19 18:58:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9581771 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 975A2604A0 for ; Sun, 19 Feb 2017 18:59:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 88AA0285A7 for ; Sun, 19 Feb 2017 18:59:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7D8A22864B; Sun, 19 Feb 2017 18:59:26 +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 35472285A7 for ; Sun, 19 Feb 2017 18:59:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751761AbdBSS7Y (ORCPT ); Sun, 19 Feb 2017 13:59:24 -0500 Received: from mail-io0-f193.google.com ([209.85.223.193]:36566 "EHLO mail-io0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751764AbdBSS7W (ORCPT ); Sun, 19 Feb 2017 13:59:22 -0500 Received: by mail-io0-f193.google.com with SMTP id q20so3076038ioi.3 for ; Sun, 19 Feb 2017 10:59:22 -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=Yack2INtYhQK1TaX//CLWFfx/VNuCoXYuWspVb1/XMA=; b=MO9q7GwjAXa3zuT3ZaVbhsseLjAyZ7yJeJsh93F7sV7/OJwIi/h7+k98rosItyBAru XwD0CqZGWBiNwHHTFyz2E+sAkLgjRdJcS1Nuy7MlkRC7JbD8Elv93raVQxfWoeL73w91 8aIGsWccH6MkQhoagZSQHZPBONbTMynj/cz3rFLgUDj/eH0kQS9CsXzO2uPb6Xf5qezZ g8UELW2U1TXivDvLmbinbWNlwc7Y5y3sKskkF/EVZfzDM7WXuc9tXaegSZpCKay2meTh VvKq67cu2HlubJNKur/T+wPPguWuQKetfnXmcZNDchY13OOL99f88YVA/FAcmpTsWtcf 3spw== 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=Yack2INtYhQK1TaX//CLWFfx/VNuCoXYuWspVb1/XMA=; b=XRTrlrD9P+2/NhsT3D58Z7dM1vJ/YfQP6sOmqgJ3uwgYDMmUOwA6AOs4TDjbHVR350 xiui1aOW/vFO2JbIYENoAHD0DDOfBHEezwuTrkP5aC939b4EZxmHaY9gjoAgkTNKF2b1 8sDBkWIBkiR6ag0uHBUPLVROFriInjIYnhO7veqI7sFYNuU61kAZa616Jc+sjSqei74L VvQ6NL98zB87VYYtdny48lVk2QzLHrnZRg3akgrC4vzKSnW71W6h/MTv5TTLPOd/37uF R3WFPKTOWCA5QwANLy9BXfktTraZL0QfvNQu8V7aexBz6h/l53CZZXpUcR+4JSmLPf/G n6lA== X-Gm-Message-State: AMke39lEwOQYbRB76V/+FEHORHpZoESQ6fleKDNAtrQo//lmHJaF1bO8OzqfVoJqv12rxA== X-Received: by 10.107.139.199 with SMTP id n190mr13519541iod.178.1487530751766; Sun, 19 Feb 2017 10:59:11 -0800 (PST) Received: from localhost.localdomain ([50.124.63.84]) by smtp.gmail.com with ESMTPSA id o20sm4039282ioo.37.2017.02.19.10.59.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 19 Feb 2017 10:59:11 -0800 (PST) From: Trond Myklebust To: Anna Schumaker , Chuck Lever Cc: linux-nfs@vger.kernel.org Subject: [PATCH v4 4/8] NFSv4: Replace callback string decode function with a generic Date: Sun, 19 Feb 2017 13:58:59 -0500 Message-Id: <20170219185903.42043-5-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170219185903.42043-4-trond.myklebust@primarydata.com> References: <20170219185903.42043-1-trond.myklebust@primarydata.com> <20170219185903.42043-2-trond.myklebust@primarydata.com> <20170219185903.42043-3-trond.myklebust@primarydata.com> <20170219185903.42043-4-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 | 30 ++++++++---------------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c index e732a65db546..2ade5cb52b8e 100644 --- a/fs/nfs/callback_xdr.c +++ b/fs/nfs/callback_xdr.c @@ -83,23 +83,15 @@ static __be32 *read_buf(struct xdr_stream *xdr, size_t nbytes) return p; } -static __be32 decode_string(struct xdr_stream *xdr, unsigned int *len, const char **str) +static __be32 decode_string(struct xdr_stream *xdr, unsigned int *len, + const char **str, size_t maxlen) { - __be32 *p; - - p = read_buf(xdr, 4); - if (unlikely(p == NULL)) - return htonl(NFS4ERR_RESOURCE); - *len = ntohl(*p); - - if (*len != 0) { - p = read_buf(xdr, *len); - if (unlikely(p == NULL)) - return htonl(NFS4ERR_RESOURCE); - *str = (const char *)p; - } else - *str = NULL; + ssize_t err; + err = xdr_stream_decode_opaque_inline(xdr, (void **)str, maxlen); + if (err < 0) + return cpu_to_be32(NFS4ERR_RESOURCE); + *len = err; return 0; } @@ -162,15 +154,9 @@ static __be32 decode_compound_hdr_arg(struct xdr_stream *xdr, struct cb_compound __be32 *p; __be32 status; - status = decode_string(xdr, &hdr->taglen, &hdr->tag); + status = decode_string(xdr, &hdr->taglen, &hdr->tag, CB_OP_TAGLEN_MAXSZ); if (unlikely(status != 0)) return status; - /* We do not like overly long tags! */ - if (hdr->taglen > CB_OP_TAGLEN_MAXSZ) { - printk("NFS: NFSv4 CALLBACK %s: client sent tag of length %u\n", - __func__, hdr->taglen); - return htonl(NFS4ERR_RESOURCE); - } p = read_buf(xdr, 12); if (unlikely(p == NULL)) return htonl(NFS4ERR_RESOURCE);