lkml.org 
[lkml]   [2020]   [Jun]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.19 008/106] net: atlantic: make hw_get_regs optional
    Date
    From: Mark Starovoytov <mstarovoitov@marvell.com>

    [ Upstream commit d0f23741c202c685447050713907f3be39a985ee ]

    This patch fixes potential crash in case if hw_get_regs is NULL.

    Signed-off-by: Mark Starovoytov <mstarovoitov@marvell.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 6 ++++++
    1 file changed, 6 insertions(+)

    diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
    index 15dcfb6704e5..adac5df0d6b4 100644
    --- a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
    +++ b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
    @@ -620,6 +620,9 @@ int aq_nic_get_regs(struct aq_nic_s *self, struct ethtool_regs *regs, void *p)
    u32 *regs_buff = p;
    int err = 0;

    + if (unlikely(!self->aq_hw_ops->hw_get_regs))
    + return -EOPNOTSUPP;
    +
    regs->version = 1;

    err = self->aq_hw_ops->hw_get_regs(self->aq_hw,
    @@ -634,6 +637,9 @@ int aq_nic_get_regs(struct aq_nic_s *self, struct ethtool_regs *regs, void *p)

    int aq_nic_get_regs_count(struct aq_nic_s *self)
    {
    + if (unlikely(!self->aq_hw_ops->hw_get_regs))
    + return 0;
    +
    return self->aq_nic_cfg.aq_hw_caps->mac_regs_count;
    }

    --
    2.25.1
    \
     
     \ /
      Last update: 2020-06-09 01:29    [W:2.201 / U:0.440 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site