linux-kernel - [PATCH v2] nfs: Return EINVAL rather than ERANGE for mount parse errors

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <465149.1579276509@warthog.procyon.org.uk>
Date:   Fri, 17 Jan 2020 15:55:09 +0000
From:   David Howells <dhowells@...hat.com>
To:     unlisted-recipients:; (no To-header on input)
Cc:     dhowells@...hat.com, Krzysztof Kozlowski <krzk@...nel.org>,
        Trond Myklebust <trond.myklebust@...merspace.com>,
        Anna Schumaker <anna.schumaker@...app.com>,
        linux-nfs@...r.kernel.org,
        "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
        Al Viro <viro@...iv.linux.org.uk>,
        Scott Mayhew <smayhew@...hat.com>,
        Arnd Bergmann <arnd@...db.de>
Subject: [PATCH v2] nfs: Return EINVAL rather than ERANGE for mount parse errors

commit b9423c912b770e5b9e4228d90da92b6a69693d8e
Author: David Howells <dhowells@...hat.com>
Date:   Fri Jan 17 15:37:46 2020 +0000

    nfs: Return EINVAL rather than ERANGE for mount parse errors
    
    Return EINVAL rather than ERANGE for mount parse errors as the userspace
    mount command doesn't necessarily understand what to do with anything other
    than EINVAL.
    
    The old code returned -ERANGE as an intermediate error that then get
    converted to -EINVAL, whereas the new code returns -ERANGE.
    
    This was induced by passing minorversion=1 to a v4 mount where
    CONFIG_NFS_V4_1 was disabled in the kernel build.
    
    Fixes: 68f65ef40e1e ("NFS: Convert mount option parsing to use functionality from fs_parser.h")
    Reported-by: Krzysztof Kozlowski <krzk@...nel.org>
    Signed-off-by: David Howells <dhowells@...hat.com>

diff --git a/fs/nfs/fs_context.c b/fs/nfs/fs_context.c
index 429315c011ae..74508ed9aeec 100644
--- a/fs/nfs/fs_context.c
+++ b/fs/nfs/fs_context.c
@@ -769,8 +769,7 @@ static int nfs_fs_context_parse_param(struct fs_context *fc,
 out_invalid_address:
 	return nfs_invalf(fc, "NFS: Bad IP address specified");
 out_of_bounds:
-	nfs_invalf(fc, "NFS: Value for '%s' out of range", param->key);
-	return -ERANGE;
+	return nfs_invalf(fc, "NFS: Value for '%s' out of range", param->key);
 }
 
 /*