lkml.org 
[lkml]   [2020]   [Aug]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH net v3 4/5] fsl/fman: check dereferencing null pointer
    Date
    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>
    ---
    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 004c266..bce3c93 100644
    --- a/drivers/net/ethernet/freescale/fman/fman_dtsec.c
    +++ b/drivers/net/ethernet/freescale/fman/fman_dtsec.c
    @@ -1200,7 +1200,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;
    @@ -1213,7 +1213,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 bb02b37..645764a 100644
    --- a/drivers/net/ethernet/freescale/fman/fman_memac.c
    +++ b/drivers/net/ethernet/freescale/fman/fman_memac.c
    @@ -981,7 +981,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 8c7eb87..41946b1 100644
    --- a/drivers/net/ethernet/freescale/fman/fman_tgec.c
    +++ b/drivers/net/ethernet/freescale/fman/fman_tgec.c
    @@ -626,7 +626,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;
    --
    1.9.1
    \
     
     \ /
      Last update: 2020-08-03 09:09    [W:4.217 / U:0.176 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site