OSDN Git Service

fs/nfs: Fix nfs_parse_devname to not modify it's argument
authorEric W. Biederman <ebiederm@xmission.com>
Wed, 30 Jan 2019 13:58:38 +0000 (07:58 -0600)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 27 Jan 2020 13:50:26 +0000 (14:50 +0100)
[ 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" <ebiederm@xmission.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
fs/nfs/super.c

index d90efde..5db7ace 100644 (file)
@@ -1930,7 +1930,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)