fsl/fman: check dereferencing null pointer

[ 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>

diff --git a/drivers/net/ethernet/freescale/fman/fman_dtsec.c b/drivers/net/ethernet/freescale/fman/fman_dtsec.c
index 7af31ddd093f8520a276a092ffd3481528177999..61238b3af20411b5fe35f524c553e060af33b3be 100644 (file)
--- 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 1fbeb991bcdf171a990dc38655001a7372ef3cd1..460f9e58e9877c97f683021d38127c00acd3492b 100644 (file)
--- 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 e575259d20f40147c7160f8a2be0636af82639a0..c8ad9b8a75f8ef5bdcfa0fe4e87a16bef630d558 100644 (file)
--- 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;