lkml.org 
[lkml]   [2019]   [Nov]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 17/75] net: Zeroing the structure ethtool_wolinfo in ethtool_get_wol()
    Date
    From: zhanglin <zhang.lin16@zte.com.cn>

    [ Upstream commit 5ff223e86f5addbfae26419cbb5d61d98f6fbf7d ]

    memset() the structure ethtool_wolinfo that has padded bytes
    but the padded bytes have not been zeroed out.

    Signed-off-by: zhanglin <zhang.lin16@zte.com.cn>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/core/ethtool.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    --- a/net/core/ethtool.c
    +++ b/net/core/ethtool.c
    @@ -941,11 +941,13 @@ static int ethtool_reset(struct net_devi

    static int ethtool_get_wol(struct net_device *dev, char __user *useraddr)
    {
    - struct ethtool_wolinfo wol = { .cmd = ETHTOOL_GWOL };
    + struct ethtool_wolinfo wol;

    if (!dev->ethtool_ops->get_wol)
    return -EOPNOTSUPP;

    + memset(&wol, 0, sizeof(struct ethtool_wolinfo));
    + wol.cmd = ETHTOOL_GWOL;
    dev->ethtool_ops->get_wol(dev, &wol);

    if (copy_to_user(useraddr, &wol, sizeof(wol)))

    \
     
     \ /
      Last update: 2019-11-08 19:52    [W:4.284 / U:0.260 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site