OSDN Git Service

ethtool: ioctl: Fix out-of-bounds warning in store_link_ksettings_for_user()
authorGustavo A. R. Silva <gustavoars@kernel.org>
Fri, 16 Apr 2021 20:15:40 +0000 (15:15 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 22 May 2021 08:59:41 +0000 (10:59 +0200)
commitb1352870018fa0cff265ff1357434195e8481560
tree99ce5da2db8b201175ff6595c222d08d65779de8
parent562bf0db279129d5ffadf210245e81667b47c7c7
ethtool: ioctl: Fix out-of-bounds warning in store_link_ksettings_for_user()

[ Upstream commit c1d9e34e11281a8ba1a1c54e4db554232a461488 ]

Fix the following out-of-bounds warning:

net/ethtool/ioctl.c:492:2: warning: 'memcpy' offset [49, 84] from the object at 'link_usettings' is out of the bounds of referenced subobject 'base' with type 'struct ethtool_link_settings' at offset 0 [-Warray-bounds]

The problem is that the original code is trying to copy data into a
some struct members adjacent to each other in a single call to
memcpy(). This causes a legitimate compiler warning because memcpy()
overruns the length of &link_usettings.base. Fix this by directly
using &link_usettings and _from_ as destination and source addresses,
instead.

This helps with the ongoing efforts to globally enable -Warray-bounds
and get us closer to being able to tighten the FORTIFY_SOURCE routines
on memcpy().

Link: https://github.com/KSPP/linux/issues/109
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
net/core/ethtool.c