]> git.ipfire.org Git - people/arne_f/kernel.git/commitdiff
Drivers: hv: vmbus: Fix the offer_in_progress in vmbus_process_offer()
authorDexuan Cui <decui@microsoft.com>
Tue, 5 Jun 2018 20:37:52 +0000 (13:37 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 9 Sep 2018 08:32:34 +0000 (10:32 +0200)
commit 50229128727f7e11840ca1b2b501f880818d56b6 upstream.

I didn't really hit a real bug, but just happened to spot the bug:
we have decreased the counter at the beginning of vmbus_process_offer(),
so we mustn't decrease it again.

Fixes: 6f3d791f3006 ("Drivers: hv: vmbus: Fix rescind handling issues")
Signed-off-by: Dexuan Cui <decui@microsoft.com>
Cc: stable@vger.kernel.org
Cc: Stephen Hemminger <sthemmin@microsoft.com>
Cc: K. Y. Srinivasan <kys@microsoft.com>
Cc: Stable <stable@vger.kernel.org> # 4.14 and above
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/hv/channel_mgmt.c

index ecc2bd275a73e614972065e1693b8a3f92a705b9..f3b551a5065348d495537493614b679c83f07195 100644 (file)
@@ -527,10 +527,8 @@ static void vmbus_process_offer(struct vmbus_channel *newchannel)
                struct hv_device *dev
                        = newchannel->primary_channel->device_obj;
 
-               if (vmbus_add_channel_kobj(dev, newchannel)) {
-                       atomic_dec(&vmbus_connection.offer_in_progress);
+               if (vmbus_add_channel_kobj(dev, newchannel))
                        goto err_free_chan;
-               }
 
                if (channel->sc_creation_callback != NULL)
                        channel->sc_creation_callback(newchannel);