mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-11-28 10:12:43 +00:00
c12eafeeb2
In particular this contains 1be7107fbe18eed3e319 ("mm: larger stack
guard gap, between vmas") which is a fix for CVE-2017-1000364.
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
From 9775eefb28bc96d40ade1e8ea051b28a493c3257 Mon Sep 17 00:00:00 2001
|
|
From: Dexuan Cui <decui@microsoft.com>
|
|
Date: Fri, 5 May 2017 16:57:12 -0600
|
|
Subject: [PATCH 03/14] vmbus: vmbus_open(): reset onchannel_callback on error
|
|
|
|
No real issue is observed without the patch, but let's add this
|
|
just in case.
|
|
|
|
Signed-off-by: Dexuan Cui <decui@microsoft.com>
|
|
Cc: K. Y. Srinivasan <kys@microsoft.com>
|
|
Cc: Haiyang Zhang <haiyangz@microsoft.com>
|
|
Cc: Stephen Hemminger <sthemmin@microsoft.com>
|
|
Origin: https://github.com/dcui/linux/commits/decui/hv_sock/v4.11/20170511-debug-0605
|
|
(cherry picked from commit c248b14174e1337c1461f9b13a573ad90a136e1c)
|
|
---
|
|
drivers/hv/channel.c | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
|
|
index 321b8833fa6f..628d6fde1887 100644
|
|
--- a/drivers/hv/channel.c
|
|
+++ b/drivers/hv/channel.c
|
|
@@ -220,6 +220,8 @@ int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size,
|
|
get_order(send_ringbuffer_size + recv_ringbuffer_size));
|
|
error_set_chnstate:
|
|
newchannel->state = CHANNEL_OPEN_STATE;
|
|
+ newchannel->onchannel_callback = NULL;
|
|
+ newchannel->channel_callback_context = NULL;
|
|
return err;
|
|
}
|
|
EXPORT_SYMBOL_GPL(vmbus_open);
|
|
--
|
|
2.13.0
|
|
|