]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
drbd: Do not access tconn after it was freed
authorPhilipp Reisner <philipp.reisner@linbit.com>
Thu, 27 Jan 2011 09:55:20 +0000 (10:55 +0100)
committerPhilipp Reisner <philipp.reisner@linbit.com>
Wed, 28 Sep 2011 08:26:22 +0000 (10:26 +0200)
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
drivers/block/drbd/drbd_main.c

index f8cb15c84ed8e09be18cee56871b34183da470b8..8349d42fa13193aaef6d790ccd02e5b6e9fc927a 100644 (file)
@@ -3260,10 +3260,6 @@ static void drbd_delete_device(unsigned int minor)
        kfree(mdev->p_uuid);
        /* mdev->p_uuid = NULL; */
 
-       kfree(mdev->tconn->int_dig_out);
-       kfree(mdev->tconn->int_dig_in);
-       kfree(mdev->tconn->int_dig_vv);
-
        /* cleanup the rest that has been
         * allocated from drbd_new_device
         * and actually free the mdev itself */
@@ -3377,6 +3373,9 @@ void drbd_free_tconn(struct drbd_tconn *tconn)
        write_unlock_irq(&global_state_lock);
 
        kfree(tconn->name);
+       kfree(tconn->int_dig_out);
+       kfree(tconn->int_dig_in);
+       kfree(tconn->int_dig_vv);
        kfree(tconn);
 }