From patchwork Sun Feb 19 21:08:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9581829 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 C0A366045A for ; Sun, 19 Feb 2017 21:08:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B0B7528708 for ; Sun, 19 Feb 2017 21:08:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A5AED2870D; Sun, 19 Feb 2017 21:08:43 +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 4652E28708 for ; Sun, 19 Feb 2017 21:08:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751668AbdBSVIm (ORCPT ); Sun, 19 Feb 2017 16:08:42 -0500 Received: from mail-it0-f67.google.com ([209.85.214.67]:33630 "EHLO mail-it0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751630AbdBSVIl (ORCPT ); Sun, 19 Feb 2017 16:08:41 -0500 Received: by mail-it0-f67.google.com with SMTP id e137so8856330itc.0 for ; Sun, 19 Feb 2017 13:08:41 -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=vnjbSeMUZ8lJBFOfr29lqwqiOeDjmgZcwP2RgDFhqsM=; b=sORboThTjalljTfkHSPrWjIge4CnCSX3kurryECkJSaBgQDjdYP7wnkxztsKHbkAI2 GshmfU3fh4bpjBcbPZnhZaP7Eub4CdpoIjI0yLf6dFzbgDytt3MSGDWMvAIVThwDFCBv 4C7J3yiwjtvZPHJcxlgN8pkMbjLvP4IAEhZk4YbU1xIpZ0xOIqsjXI+iT7bERIXHpscX B4ImsueyRDIsPQ1/4m7ZYn7PLxd2aJr5bWFGRz9Y7VXTFQKrejl7SPrCZ2t7oHDfJTZW JsvLzM4952alENez+2bVpnVk83HmGowC/n7CMH8u0wYmH3rz+dBMvI42xmnGfjynOhvP zMsg== 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=vnjbSeMUZ8lJBFOfr29lqwqiOeDjmgZcwP2RgDFhqsM=; b=UYsomWyQTsaJsBsUl32iPg9FpQeWzQb577g6Oq6cC3TYcHOsG+zeq5WoQLJNrsvJaM COt34+FLbbgGa60TC/7i2ARlBt2AuwWzt4PLgg6Y8eVK1c/1/6SuF39whVou+DmPq8Ur Zn19RNeSyO6LN48Xz4SfPMkFPeMdNrlzXcprhTCdMlBKR8Fc0zWbPpvvKHvlkoDXniYN RWlS5JmyHJqr5v9P9kHOvy+EeKr0+0Bw2+/TXbkCzfQgJMzTT/iyMKsHwNh10X5ZE9DO pTB43Ap0DCGH4SpngQmDTC4J61+Zq8LsA73t+fJYn8rlhMnFooCaekO8o5/2Z9/j5m/N Zd9Q== X-Gm-Message-State: AMke39l1EvNrgbzMg3XQgYIZY/tRVjuO+wBcNOmLs7HiZmtlThbX5BBW5/0A665eaUAEFQ== X-Received: by 10.36.200.9 with SMTP id w9mr18185823itf.113.1487538520700; Sun, 19 Feb 2017 13:08:40 -0800 (PST) Received: from localhost.localdomain ([50.124.63.84]) by smtp.gmail.com with ESMTPSA id g204sm4076485ita.31.2017.02.19.13.08.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 19 Feb 2017 13:08:40 -0800 (PST) From: Trond Myklebust To: Anna Schumaker , Chuck Lever Cc: linux-nfs@vger.kernel.org Subject: [PATCH v5 3/8] NFSv4: Replace the open coded decode_opaque_inline() with the new generic Date: Sun, 19 Feb 2017 16:08:27 -0500 Message-Id: <20170219210832.61213-4-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170219210832.61213-3-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> 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 Also ensure that we always check that the size of the decoded object matches the expectation that it must be smaller than NFS4_OPAQUE_LIMIT. This should be true for all the current users of decode_opaque_inline(), including decode_ace(), decode_pathname(), decode_attr_fs_locations() and decode_exchange_id(). Note that this allows us to get rid of a number of existing checks in decode_exchange_id(), Signed-off-by: Trond Myklebust Reviewed-by: Chuck Lever --- fs/nfs/nfs4xdr.c | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c index 5f0a6fcd0030..d10cc2a62dff 100644 --- a/fs/nfs/nfs4xdr.c +++ b/fs/nfs/nfs4xdr.c @@ -3050,20 +3050,15 @@ 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, + NFS4_OPAQUE_LIMIT); + if (unlikely(ret < 0)) { + if (ret == -EBADMSG) + 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) @@ -5645,8 +5640,6 @@ static int decode_exchange_id(struct xdr_stream *xdr, status = decode_opaque_inline(xdr, &dummy, &dummy_str); if (unlikely(status)) return status; - if (unlikely(dummy > NFS4_OPAQUE_LIMIT)) - return -EIO; memcpy(res->server_owner->major_id, dummy_str, dummy); res->server_owner->major_id_sz = dummy; @@ -5654,8 +5647,6 @@ static int decode_exchange_id(struct xdr_stream *xdr, status = decode_opaque_inline(xdr, &dummy, &dummy_str); if (unlikely(status)) return status; - if (unlikely(dummy > NFS4_OPAQUE_LIMIT)) - return -EIO; memcpy(res->server_scope->server_scope, dummy_str, dummy); res->server_scope->server_scope_sz = dummy; @@ -5670,16 +5661,12 @@ static int decode_exchange_id(struct xdr_stream *xdr, status = decode_opaque_inline(xdr, &dummy, &dummy_str); if (unlikely(status)) return status; - if (unlikely(dummy > NFS4_OPAQUE_LIMIT)) - return -EIO; memcpy(res->impl_id->domain, dummy_str, dummy); /* nii_name */ status = decode_opaque_inline(xdr, &dummy, &dummy_str); if (unlikely(status)) return status; - if (unlikely(dummy > NFS4_OPAQUE_LIMIT)) - return -EIO; memcpy(res->impl_id->name, dummy_str, dummy); /* nii_date */