1 files changed, 7 insertions, 3 deletions

diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 2d8d8fcfa060..f4e9037f9a0c 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -2019,11 +2019,15 @@ replay:
                 if (ops->newlink) {
                         err = ops->newlink(net, dev, tb, data);
                         /* Drivers should call free_netdev() in ->destructor
-                         * and unregister it on failure so that device could be
-                         * finally freed in rtnl_unlock.
+                         * and unregister it on failure after registration
+                         * so that device could be finally freed in rtnl_unlock.
                          */
-                        if (err < 0)
+                        if (err < 0) {
+                                /* If device is not registered at all, free it now */
+                                if (dev->reg_state == NETREG_UNINITIALIZED)
+                                        free_netdev(dev);
                                 goto out;
+                        }
                 } else {
                         err = register_netdevice(dev);
                         if (err < 0) {