From patchwork Sat May 24 03:19:57 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kinglong Mee X-Patchwork-Id: 4236501 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 120E0BF90B for ; Sat, 24 May 2014 03:20:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 15712203DA for ; Sat, 24 May 2014 03:20:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2BFBD203B8 for ; Sat, 24 May 2014 03:20:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751167AbaEXDUS (ORCPT ); Fri, 23 May 2014 23:20:18 -0400 Received: from mail-oa0-f42.google.com ([209.85.219.42]:43339 "EHLO mail-oa0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751151AbaEXDUS (ORCPT ); Fri, 23 May 2014 23:20:18 -0400 Received: by mail-oa0-f42.google.com with SMTP id j17so6483914oag.29 for ; Fri, 23 May 2014 20:20:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=fgQysRLZ37/qJoNFvYx11Atani/z+cTinPkDhqIyd1g=; b=N3wMa83CJCXpDvmqnhSOFvFiuINV3XG9LNkZVtKIrrMSxBgU12YT3ksW3uZEQ1gthg 8imsvvE0SkwKIlE9ZRHfi4Sa9s4x0US5HwZUGfqyfxac70OCRZ5Jdqdi7wyhjyVDu4aN 5DolYStQBPpxygnCal/uG3A68Iw8gsHv4omc5/joe43cJxEvkk11gdNeYGIaQMFK126q 2mTem2AC/Rt1Wp1xSQ56grCgkWg9X4Iw/qvhT2edQxVIgviLLs/GesrrqHiZg76tadel HiMcck4ehLUhBcwQoOxTe49e5e4cbPp48o+PTCMg5004TDVOlMbC2+V+ToSEG0eiCsnw 6q8g== X-Received: by 10.60.133.81 with SMTP id pa17mr9476115oeb.35.1400901617493; Fri, 23 May 2014 20:20:17 -0700 (PDT) Received: from [192.168.31.158] ([118.117.113.227]) by mx.google.com with ESMTPSA id jr2sm8981443obb.8.2014.05.23.20.20.13 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 23 May 2014 20:20:16 -0700 (PDT) Message-ID: <53800FDD.7030001@gmail.com> Date: Sat, 24 May 2014 11:19:57 +0800 From: Kinglong Mee User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:24.0) Gecko/20100101 Thunderbird/24.5.0 MIME-Version: 1.0 To: "J. Bruce Fields" CC: Linux NFS Mailing List , kinglongmee@gmail.com Subject: [PATCH v2] NFSD: Error out when getting more than one fsloc/secinfo/uuid References: <537F38AB.10102@gmail.com> <20140523135435.GK25423@fieldses.org> <537F5A1A.9000005@gmail.com> <20140523144128.GO25423@fieldses.org> In-Reply-To: <20140523144128.GO25423@fieldses.org> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP v2: remove WARN_ON_ONCE(1) and return -EINVAL instead of ignoring it. Signed-off-by: Kinglong Mee --- fs/nfsd/export.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c index 7884051..13b85f9 100644 --- a/fs/nfsd/export.c +++ b/fs/nfsd/export.c @@ -389,6 +389,10 @@ fsloc_parse(char **mesg, char *buf, struct nfsd4_fs_locations *fsloc) int len; int migrated, i, err; + /* more than one fsloc */ + if (fsloc->locations) + return -EINVAL; + /* listsize */ err = get_uint(mesg, &fsloc->locations_count); if (err) @@ -442,6 +446,10 @@ static int secinfo_parse(char **mesg, char *buf, struct svc_export *exp) u32 listsize; int err; + /* more than one secinfo */ + if (exp->ex_nflavors) + return -EINVAL; + err = get_uint(mesg, &listsize); if (err) return err; @@ -481,6 +489,10 @@ uuid_parse(char **mesg, char *buf, unsigned char **puuid) { int len; + /* more than one uuid */ + if (*puuid) + return -EINVAL; + /* expect a 16 byte uuid encoded as \xXXXX... */ len = qword_get(mesg, buf, PAGE_SIZE); if (len != EX_UUID_LEN)