From patchwork Thu Apr 16 12:51:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kinglong Mee X-Patchwork-Id: 6225661 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A6130BF4A6 for ; Thu, 16 Apr 2015 12:51:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C48E2202A1 for ; Thu, 16 Apr 2015 12:51:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EEB882027D for ; Thu, 16 Apr 2015 12:51:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754386AbbDPMvZ (ORCPT ); Thu, 16 Apr 2015 08:51:25 -0400 Received: from mail-pa0-f47.google.com ([209.85.220.47]:33229 "EHLO mail-pa0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752608AbbDPMvZ (ORCPT ); Thu, 16 Apr 2015 08:51:25 -0400 Received: by paboj16 with SMTP id oj16so88883390pab.0 for ; Thu, 16 Apr 2015 05:51:24 -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 :content-type:content-transfer-encoding; bh=Z1ifKfzJ2UgnbvVlabGEHeReSAx2FNtdSOymK2EoZCA=; b=OfBO280sqVFXYJaeTdVhDU8hZ4/VezlVhCBWoYd/LNojGpz6mNRa0AH4pZ1hIOCi5d 9mXoORPjsaxBfFNf6717Za7sWQki1jhGVNAa8i4bU6MWrzKUCQx2HAYo0Tw9qhFtAtFs jtceVQRV86cmvskSwVpNAlPFdqyvHBwRvCyrC8x5j631qoNEZoVncRGTj3ABYdJ2FFpq Ex7xlJqSBJS3BpEvt+A573wrfA7rK8QnGAfanYeKJkyiI9VgyeMsMHDLsrz5iRh7ny9D aWCyZ2MmnAu+eNXFH4U2W+J58dpzy/asqfmugAnJclwq4rdSuDondPqdJNMsqZ1I5WWi b1gA== X-Received: by 10.66.137.98 with SMTP id qh2mr55654045pab.76.1429188684879; Thu, 16 Apr 2015 05:51:24 -0700 (PDT) Received: from [192.168.99.5] ([104.143.41.79]) by mx.google.com with ESMTPSA id xv9sm7138423pbc.2.2015.04.16.05.51.20 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Apr 2015 05:51:23 -0700 (PDT) Message-ID: <552FB045.80604@gmail.com> Date: Thu, 16 Apr 2015 20:51:17 +0800 From: Kinglong Mee User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0 MIME-Version: 1.0 To: Steve Dickson CC: "linux-nfs@vger.kernel.org" , smayhew@redhat.com, kinglongmee@gmail.com Subject: [PATCH] rpc.mountd: Remove duplicate and invalid secinfo setting Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, 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 NFSD return reply of client's SECINFO_NO_NAME request with four security information number as, 1 1 0 0 It's caused by commit 4a1ad4aa30, "mountd: Enable all auth flavors on pseudofs exports" This patch removes duplicate secinfo and invalid secinfo (zero). Signed-off-by: Kinglong Mee Acked-by: Scott Mayhew --- support/nfs/exports.c | 2 +- utils/mountd/v4root.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/support/nfs/exports.c b/support/nfs/exports.c index 761a046..0aea6f1 100644 --- a/support/nfs/exports.c +++ b/support/nfs/exports.c @@ -408,7 +408,7 @@ int secinfo_addflavor(struct flav_info *flav, struct exportent *ep) struct sec_entry *p; for (p=ep->e_secinfo; p->flav; p++) { - if (p->flav == flav) + if (p->flav == flav || p->flav->fnum == flav->fnum) return p - ep->e_secinfo; } if (p - ep->e_secinfo >= SECFLAVOR_COUNT) { diff --git a/utils/mountd/v4root.c b/utils/mountd/v4root.c index 429ebb8..d521725 100644 --- a/utils/mountd/v4root.c +++ b/utils/mountd/v4root.c @@ -69,6 +69,9 @@ set_pseudofs_security(struct exportent *pseudo, int flags) for (flav = flav_map; flav < flav_map + flav_map_size; flav++) { struct sec_entry *new; + if (!flav->fnum) + continue; + i = secinfo_addflavor(flav, pseudo); new = &pseudo->e_secinfo[i];