Skip to contentSkip to conversation

net: core: Fix possible null-pointer dereference in failover_slave_register()

PATCH In review Tuo Li 2 participants 2 messages Aug 10, 2021

Subsystems (3)
lore
Share & tools
lore

Tuo Li

author
#0 lore raw

PATCH 1/1 net: core: Fix possible null-pointer dereference in failover_slave_register()

The variable fops is checked in:
if (fops && fops->slave_pre_register &&

    fops->slave_pre_register(slave_dev, failover_dev))

This indicates that it can be NULL.
However, it is dereferenced when calling netdev_rx_handler_register():
err = netdev_rx_handler_register(slave_dev, fops->slave_handle_frame,

                    failover_dev);

To fix this possible null-pointer dereference, check fops first, and if it is NULL, assign -EINVAL to err.

---
 net/core/failover.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
net/core/failover.c +4 -1
index b5cd3c727285..113a4dacdf48 100644
@@ -63,8 +63,11 @@ static int failover_slave_register(struct net_device *slave_dev)
 	    fops->slave_pre_register(slave_dev, failover_dev))
 		goto done;
 
-	err = netdev_rx_handler_register(slave_dev, fops->slave_handle_frame,
+	if (fops)
+		err = netdev_rx_handler_register(slave_dev, fops->slave_handle_frame,
 					 failover_dev);
+	else
+		err = -EINVAL;
 	if (err) {
 		netdev_err(slave_dev, "can not register failover rx handler (err = %d)\n",
 			   err);
Signature · 1 line
2.25.1
maintainer
#1 lore raw
Quoted 11 lines · On Tue, 10 Aug 2021 02:18:00 -0700 Tuo Li wrote:

The variable fops is checked in:
if (fops && fops->slave_pre_register &&

    fops->slave_pre_register(slave_dev, failover_dev))

This indicates that it can be NULL.
However, it is dereferenced when calling netdev_rx_handler_register():
err = netdev_rx_handler_register(slave_dev, fops->slave_handle_frame,

                    failover_dev);

To fix this possible null-pointer dereference, check fops first, and if it is NULL, assign -EINVAL to err.

The other fops checks look like defensive programming. I don't see anywhere where fops would be cleared, and all callers pass it to register().