Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp4440204ybi; Mon, 3 Jun 2019 10:53:40 -0700 (PDT) X-Google-Smtp-Source: APXvYqwaXGbIG04YgyvQokjx+g23ghgI846NIXk1pOzt4vjsy/qNKjN26KYzWrQVaCR5cGvw++XC X-Received: by 2002:a17:90a:a008:: with SMTP id q8mr12073186pjp.114.1559584420037; Mon, 03 Jun 2019 10:53:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559584420; cv=none; d=google.com; s=arc-20160816; b=BwNt+mpMpclQ+dsNmpivEH9oEZjlS5XnKVhD6Pxb+UhHi1eGqFSoC4t2DXqG3erM1Y ggVaQT2UVb9xUebXYcWnceLMfwJFUEnVjrTvW3onkajdaZfn4VF+1wKd9S52xNe+tDOI U4w1jU+65zWNtzoRxiF7laKTlCzx23bjGy1wXMdYU0z+Y1LiuosWEibWhpWQIL9Uahee CiwGdFQiaTYWbcTFV4l4YR1HuvwOsKLPja3aOgag/VsxHBe4haDkvPT8l1oYSUOJ0jx9 cloLHIVfduFqZ2S6MhhTNDFMGkJxeQg1z95r6nK64FqVI7OBgheevFoOfkcbJQ12qUD7 ObAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=GT8X+EsNYBb5UMZWBMZ2Z4O0Ne33KByhJ3ztwwgYRAs=; b=HSfdoLI/y5qSAz9Wdcx7KFrT9/6nQb+hHP7AtVIwuVLZwjaLpTJMAvb58OJdXZ7Ju9 STwD/QoIMd+K1Ef9NFbzBss9ZhGVe3NfAF4Kqr2d112aRKyNFdOgQarOMR2ujV/EzpS2 ND0GkuCV9EJ8YvEJDCd9+pnC4wgEtBr36DBE1wG8uhHcNFGOYZRrYD1Cw1YqG1JEmLUo TlUSXMWRxMc2VC581ButC82SCqZ0WOfG+YLG0HK+cLbA5MkTWJBG5We5OxwSMf/Ae5N7 z7Syb+8MXRi5XxEqTokziwkVBSFPy730RrqSA9M+zXFLA5jmKtNROzJqjn1HWUJvRU3T /q8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=oXfU8Kd+; spf=pass (google.com: best guess record for domain of linux-nfs-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h94si8161760pje.12.2019.06.03.10.53.26; Mon, 03 Jun 2019 10:53:40 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-nfs-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=oXfU8Kd+; spf=pass (google.com: best guess record for domain of linux-nfs-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726823AbfFCRQC (ORCPT + 99 others); Mon, 3 Jun 2019 13:16:02 -0400 Received: from mail-it1-f195.google.com ([209.85.166.195]:35421 "EHLO mail-it1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728993AbfFCRP4 (ORCPT ); Mon, 3 Jun 2019 13:15:56 -0400 Received: by mail-it1-f195.google.com with SMTP id n189so9385524itd.0 for ; Mon, 03 Jun 2019 10:15:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GT8X+EsNYBb5UMZWBMZ2Z4O0Ne33KByhJ3ztwwgYRAs=; b=oXfU8Kd+U3YooLaIdo2/Uk53G9kxv6p6ODuXkBiZM8GzLU3MvCCrosJ2j4JL+MHojs /72WbxaLQlHQXcZrM9Y/BCT8+XU3tFJqi6sX3kW8qwrCEtf+dCGCoI+tAE+hJ3ZmanQq zishqNcmHAo93zyHAigQMrqhXRytR7ngC5JRV8KWSWzGLv2v6kYWQds3XKZ0nnrNdT4+ VColuGs3k5QIercFxjE97kcyOWqKlGcxdvlT0t/3zyNvblteJUefn++kb1DtYVd2gKxV dTOLJbr0HK1LVessxeYmZEWP4ml+qWQboqKQzfZeF/fXb9JasWX2VQfRaap3kgjxhIw+ BRcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GT8X+EsNYBb5UMZWBMZ2Z4O0Ne33KByhJ3ztwwgYRAs=; b=lwcJCDTZsyoVtjzWo6f5NRS+pESGMIIsPYylIl6sfoGZ9ZNeS2Xi66DEEcWEemntEQ ns35cyq1APkg7OTSWxpYXpHYKYkrOcE71sFRQ20YG+RVHaG2Zj3TldEXiyC4E8i5y7P3 fpRYku4FCO7hRGjJ5APgpWpPasiINy647U8cuzExQUxPnzoheDx/7lYV9jqBbJhWImgz 4sl4t0A1CUezDnZqazUr+L8Cqd3NlqSe5pwYlORC78tuSSL90p8REdjw7zBOgvvJ15WJ 5nVrSp/N8Sln1BXfto/U1oljF1yxJxyFLgUmF/3Rc53uunm4PVcaG6ijfTuoGi4bj1/O Rl9g== X-Gm-Message-State: APjAAAX5AbF4cygK1EKNAtFVXfCe3YgwV8CdQMy4q5b/oDKwhCY+1Tep TXv+21ZkdrD7KaYQ8l8eNL4HSEI= X-Received: by 2002:a02:c95a:: with SMTP id u26mr2423772jao.15.1559582155559; Mon, 03 Jun 2019 10:15:55 -0700 (PDT) Received: from localhost.localdomain (50-36-175-138.alma.mi.frontiernet.net. [50.36.175.138]) by smtp.gmail.com with ESMTPSA id b8sm1971375ioj.16.2019.06.03.10.15.54 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 03 Jun 2019 10:15:55 -0700 (PDT) From: Trond Myklebust X-Google-Original-From: Trond Myklebust To: Steve Dickson Cc: "J. Bruce Fields" , linux-nfs@vger.kernel.org Subject: [PATCH 1/3] mountd: Fix up incorrect comparison in next_mnt() Date: Mon, 3 Jun 2019 13:12:25 -0400 Message-Id: <20190603171227.29148-2-trond.myklebust@hammerspace.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190603171227.29148-1-trond.myklebust@hammerspace.com> References: <20190603171227.29148-1-trond.myklebust@hammerspace.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org We want to ensure that we compare the full name of the last component. Reported-by: "J. Bruce Fields" Signed-off-by: Trond Myklebust --- utils/mountd/cache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c index d818c971bded..d616d526667e 100644 --- a/utils/mountd/cache.c +++ b/utils/mountd/cache.c @@ -400,7 +400,7 @@ static char *next_mnt(void **v, char *p) while ((me = getmntent(f)) != NULL && l > 1) { mnt_dir = nfsd_path_strip_root(me->mnt_dir); - if (strncmp(mnt_dir, p, l) == 0 && mnt_dir[l] != '/') + if (strncmp(mnt_dir, p, l) == 0 && mnt_dir[l] == '/') return mnt_dir; } endmntent(f); -- 2.21.0