From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B643FC2D0DB for ; Tue, 28 Jan 2020 14:18:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8003921739 for ; Tue, 28 Jan 2020 14:18:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580221096; bh=AG8+qDcIsRdhVlzkwZ1uFIM4U6Qntjrlc0r5WJo+wB4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=sbVGiifgpgh3Spu6MwMKHPvty0LPp5yVFu1kzsXD0YCwex/aesMiAoH4vTDwu3rfs hh2p0SRwzYq90QsWZWTfq+j1BJOifDhUVWucSCtcbN0Wd48scy3ggrmOosrQKrFlQe SxgAFbjYhXCTy/ZUA3pj+BGLnT+BLnRfTsuTA2xs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730654AbgA1OSP (ORCPT ); Tue, 28 Jan 2020 09:18:15 -0500 Received: from mail.kernel.org ([198.145.29.99]:42068 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730385AbgA1OSK (ORCPT ); Tue, 28 Jan 2020 09:18:10 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3BCC52071E; Tue, 28 Jan 2020 14:18:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580221089; bh=AG8+qDcIsRdhVlzkwZ1uFIM4U6Qntjrlc0r5WJo+wB4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UBF8O69S/kkhEV2VoUoUN/NzIfcpr9BpNyigHXUujLW2IKKx5ZOR4WIRKx2zkq9ue MQI3IWPTAqGB7/E9vMWeZCToV0PpOoC+UzFHfMl4gBbVvR55CUWCLdiaylBPen05BQ x+dhBR6+MZwyhNwPoTfDYlNF9RjjxlyIcOdExmJU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Eric W. Biederman" , Trond Myklebust , Sasha Levin Subject: [PATCH 4.9 085/271] fs/nfs: Fix nfs_parse_devname to not modify its argument Date: Tue, 28 Jan 2020 15:03:54 +0100 Message-Id: <20200128135858.900550998@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200128135852.449088278@linuxfoundation.org> References: <20200128135852.449088278@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Eric W. Biederman [ Upstream commit 40cc394be1aa18848b8757e03bd8ed23281f572e ] In the rare and unsupported case of a hostname list nfs_parse_devname will modify dev_name. There is no need to modify dev_name as the all that is being computed is the length of the hostname, so the computed length can just be shorted. Fixes: dc04589827f7 ("NFS: Use common device name parsing logic for NFSv4 and NFSv2/v3") Signed-off-by: "Eric W. Biederman" Signed-off-by: Trond Myklebust Signed-off-by: Sasha Levin --- fs/nfs/super.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/nfs/super.c b/fs/nfs/super.c index 42c31587a936c..4c21e572f2d9e 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c @@ -1928,7 +1928,7 @@ static int nfs_parse_devname(const char *dev_name, /* kill possible hostname list: not supported */ comma = strchr(dev_name, ','); if (comma != NULL && comma < end) - *comma = 0; + len = comma - dev_name; } if (len > maxnamlen) -- 2.20.1