]> rtime.felk.cvut.cz Git - hercules2020/nv-tegra/linux-4.4.git/commit
NFSv4.x: hide array-bounds warning
authorArnd Bergmann <arnd@arndb.de>
Tue, 22 Nov 2016 20:50:52 +0000 (21:50 +0100)
committerIshan Mittal <imittal@nvidia.com>
Fri, 6 Jan 2017 10:18:49 +0000 (15:48 +0530)
commit2f1acf33dd83dfe37c0efd69f167253f496b5d9e
tree831457606bc56994de24c5f3008852234ddeb569
parentd4a3746f075c95a638e162f93906f100a468bb9a
NFSv4.x: hide array-bounds warning

commit d55b352b01bc78fbc3d1bb650140668b87e58bf9 upstream.

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: 98b0f80c2396 ("NFSv4.x: Fix a refcount leak in nfs_callback_up_net")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/nfs/callback.c