From patchwork Sun Feb 19 21:08:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9581839 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 BFB2C6057F for ; Sun, 19 Feb 2017 21:08:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B0F3828708 for ; Sun, 19 Feb 2017 21:08:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A5CC72870C; Sun, 19 Feb 2017 21:08:50 +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 58F5C2870F for ; Sun, 19 Feb 2017 21:08:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751669AbdBSVIt (ORCPT ); Sun, 19 Feb 2017 16:08:49 -0500 Received: from mail-it0-f68.google.com ([209.85.214.68]:35514 "EHLO mail-it0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751780AbdBSVIs (ORCPT ); Sun, 19 Feb 2017 16:08:48 -0500 Received: by mail-it0-f68.google.com with SMTP id 203so8864326ith.2 for ; Sun, 19 Feb 2017 13:08:47 -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=jmGFUb7vvk1jNZg+qLEBKktfQ4eP8N38WgR05Eo3+X8=; b=P8ivpqAzOMgEgZ/jLCzmAe8ETd3RWIY416Gmta+Isf07u2DBqsDeRwj5hK4Z0O4KvQ j5N7pv7DNoaWSg+0az5kiYrJnb9/1CAdMVnysArk/A3mGEkBZjDvypIun70iXV5ptzaQ JqHxZ6/Jn3sbvQs/ct+A8FuFqAKlyY3BG4fPfCkGd1F+EHr6VyXKoJrEjK3zskPPvDBk TZOgCx781ShUXtGTSPvQtAPWizEvAKeIg44FrSaUn2ipRJ2EgZwQo0MToKV3Zi9gF3ug Iyma2NNLMf2PGnu2TP0x6RZDJiK+MnGQpPpzDvTw7eKsDrbdmkOzIEXkKKHNXBmtWoYy j/xQ== 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=jmGFUb7vvk1jNZg+qLEBKktfQ4eP8N38WgR05Eo3+X8=; b=XjgBwH/2rhC8pHSHQ2Wf+NExrmRw4YKrvsw7BJhKPfutJ3PVnuk9sWQAnF1Zw7/9LE HsuR6R7UNoPgf4UK7Mosc9o3CZBKS6YG2HNU3G/Xiqz/HXKnGFhD1NRyoNrcuWlEaQIE 9CHjqfJJ0xT80Zlp9eyrGdECm8AM/7ev82UmvV72Y6e1peRqMr3xFG5dcEzGHsmCFGBG PNmDYga7h8Eix9Wkt4/wsyW3QPGDeEO1FDlO1k3V+OF82caGyaA0TjIIPJ55EkLRL6JO lh/T+DZYWQBg5rm6KuABrbwUKlpL5zruuIEuEVu8hNUOHEcEnhW6Uqwvb6X1c3Uc0/3q K0kQ== X-Gm-Message-State: AMke39myF2wx8HZVh5k3pqN6WlgQI+FH4M4KDD7ZXTsgLPFG9XQAgbJTG6mxX0i3acO+ow== X-Received: by 10.36.31.205 with SMTP id d196mr17457702itd.112.1487538521925; Sun, 19 Feb 2017 13:08:41 -0800 (PST) Received: from localhost.localdomain ([50.124.63.84]) by smtp.gmail.com with ESMTPSA id g204sm4076485ita.31.2017.02.19.13.08.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 19 Feb 2017 13:08:41 -0800 (PST) From: Trond Myklebust To: Anna Schumaker , Chuck Lever Cc: linux-nfs@vger.kernel.org Subject: [PATCH v5 4/8] NFSv4: Replace callback string decode function with a generic Date: Sun, 19 Feb 2017 16:08:28 -0500 Message-Id: <20170219210832.61213-5-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170219210832.61213-4-trond.myklebust@primarydata.com> References: <20170219210832.61213-1-trond.myklebust@primarydata.com> <20170219210832.61213-2-trond.myklebust@primarydata.com> <20170219210832.61213-3-trond.myklebust@primarydata.com> <20170219210832.61213-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 Reviewed-by: Chuck Lever --- 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);