]> git.baikalelectronics.ru Git - kernel.git/commit
NFSv4.x: hide array-bounds warning
authorArnd Bergmann <arnd@arndb.de>
Tue, 22 Nov 2016 20:50:52 +0000 (21:50 +0100)
committerAnna Schumaker <Anna.Schumaker@Netapp.com>
Tue, 22 Nov 2016 21:11:44 +0000 (16:11 -0500)
commite6f7767fefc816fa12a5e18f032522d96d511c74
tree8e0258155cc4005612bd9868979858a7c108b10f
parent6ab2da08066e56598c8aebe5f93d9d20af62b021
NFSv4.x: hide array-bounds warning

A correct bugfix introduced a harmless warning that shows up with gcc-7:

fs/nfs/callback.c: In function 'nfs_callback_up':
fs/nfs/callback.c:214:14: error: array subscript is outside array bounds [-Werror=array-bounds]

What happens here is that the 'minorversion == 0' check tells the
compiler that we assume minorversion can be something other than 0,
but when CONFIG_NFS_V4_1 is disabled that would be invalid and
result in an out-of-bounds access.

The added check for IS_ENABLED(CONFIG_NFS_V4_1) tells gcc that this
really can't happen, which makes the code slightly smaller and also
avoids the warning.

The bugfix that introduced the warning is marked for stable backports,
we want this one backported to the same releases.

Fixes: b21439da7852 ("NFSv4.x: Fix a refcount leak in nfs_callback_up_net")
Cc: stable@vger.kernel.org # v3.7+
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
fs/nfs/callback.c