lkml.org 
[lkml]   [2020]   [Aug]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 133/228] fsl/fman: check dereferencing null pointer
    Date
    From: Florinel Iordache <florinel.iordache@nxp.com>

    [ Upstream commit cc5d229a122106733a85c279d89d7703f21e4d4f ]

    Add a safe check to avoid dereferencing null pointer

    Fixes: 57ba4c9b56d8 ("fsl/fman: Add FMan MAC support")
    Signed-off-by: Florinel Iordache <florinel.iordache@nxp.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/freescale/fman/fman_dtsec.c | 4 ++--
    drivers/net/ethernet/freescale/fman/fman_memac.c | 2 +-
    drivers/net/ethernet/freescale/fman/fman_tgec.c | 2 +-
    3 files changed, 4 insertions(+), 4 deletions(-)

    diff --git a/drivers/net/ethernet/freescale/fman/fman_dtsec.c b/drivers/net/ethernet/freescale/fman/fman_dtsec.c
    index 7af31ddd093f8..61238b3af2041 100644
    --- a/drivers/net/ethernet/freescale/fman/fman_dtsec.c
    +++ b/drivers/net/ethernet/freescale/fman/fman_dtsec.c
    @@ -1159,7 +1159,7 @@ int dtsec_del_hash_mac_address(struct fman_mac *dtsec, enet_addr_t *eth_addr)
    list_for_each(pos,
    &dtsec->multicast_addr_hash->lsts[bucket]) {
    hash_entry = ETH_HASH_ENTRY_OBJ(pos);
    - if (hash_entry->addr == addr) {
    + if (hash_entry && hash_entry->addr == addr) {
    list_del_init(&hash_entry->node);
    kfree(hash_entry);
    break;
    @@ -1172,7 +1172,7 @@ int dtsec_del_hash_mac_address(struct fman_mac *dtsec, enet_addr_t *eth_addr)
    list_for_each(pos,
    &dtsec->unicast_addr_hash->lsts[bucket]) {
    hash_entry = ETH_HASH_ENTRY_OBJ(pos);
    - if (hash_entry->addr == addr) {
    + if (hash_entry && hash_entry->addr == addr) {
    list_del_init(&hash_entry->node);
    kfree(hash_entry);
    break;
    diff --git a/drivers/net/ethernet/freescale/fman/fman_memac.c b/drivers/net/ethernet/freescale/fman/fman_memac.c
    index 1fbeb991bcdf1..460f9e58e9877 100644
    --- a/drivers/net/ethernet/freescale/fman/fman_memac.c
    +++ b/drivers/net/ethernet/freescale/fman/fman_memac.c
    @@ -956,7 +956,7 @@ int memac_del_hash_mac_address(struct fman_mac *memac, enet_addr_t *eth_addr)

    list_for_each(pos, &memac->multicast_addr_hash->lsts[hash]) {
    hash_entry = ETH_HASH_ENTRY_OBJ(pos);
    - if (hash_entry->addr == addr) {
    + if (hash_entry && hash_entry->addr == addr) {
    list_del_init(&hash_entry->node);
    kfree(hash_entry);
    break;
    diff --git a/drivers/net/ethernet/freescale/fman/fman_tgec.c b/drivers/net/ethernet/freescale/fman/fman_tgec.c
    index e575259d20f40..c8ad9b8a75f8e 100644
    --- a/drivers/net/ethernet/freescale/fman/fman_tgec.c
    +++ b/drivers/net/ethernet/freescale/fman/fman_tgec.c
    @@ -585,7 +585,7 @@ int tgec_del_hash_mac_address(struct fman_mac *tgec, enet_addr_t *eth_addr)

    list_for_each(pos, &tgec->multicast_addr_hash->lsts[hash]) {
    hash_entry = ETH_HASH_ENTRY_OBJ(pos);
    - if (hash_entry->addr == addr) {
    + if (hash_entry && hash_entry->addr == addr) {
    list_del_init(&hash_entry->node);
    kfree(hash_entry);
    break;
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-08-20 13:07    [W:4.669 / U:0.088 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site