mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-10-30 20:31:02 +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>
29 lines
887 B
Diff
29 lines
887 B
Diff
From 15e83cf74b9b7b192db436f12bccf3918d9be253 Mon Sep 17 00:00:00 2001
|
|
From: Stefan Hajnoczi <stefanha@redhat.com>
|
|
Date: Fri, 5 Aug 2016 13:52:09 +0100
|
|
Subject: [PATCH 13/44] virtio-vsock: fix include guard typo
|
|
|
|
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
(cherry picked from commit 28ad55578b8a76390d966b09da8c7fa3644f5140)
|
|
---
|
|
include/uapi/linux/virtio_vsock.h | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/include/uapi/linux/virtio_vsock.h b/include/uapi/linux/virtio_vsock.h
|
|
index 6b011c19b50f..1d57ed3d84d2 100644
|
|
--- a/include/uapi/linux/virtio_vsock.h
|
|
+++ b/include/uapi/linux/virtio_vsock.h
|
|
@@ -32,7 +32,7 @@
|
|
*/
|
|
|
|
#ifndef _UAPI_LINUX_VIRTIO_VSOCK_H
|
|
-#define _UAPI_LINUX_VIRTIO_VOSCK_H
|
|
+#define _UAPI_LINUX_VIRTIO_VSOCK_H
|
|
|
|
#include <linux/types.h>
|
|
#include <linux/virtio_ids.h>
|
|
--
|
|
2.13.0
|
|
|