mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-11-02 06:34:10 +00:00
566bb2a1f0
This also adds the cherry-picked commit f1c635b439a5c017 ("scsi: storvsc: Workaround
for virtual DVD SCSI version") from 4.11 for the 4.9 and 4.10 kernels. This commit
fixes a crash/memory leak on Hyper-V when no disk drives are attached and if one
boots of a CD-ROM drive.
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
53 lines
2.3 KiB
Diff
53 lines
2.3 KiB
Diff
From df6f53e7e114aff82892cb7c7ba545f9cc53a05d Mon Sep 17 00:00:00 2001
|
|
From: Dexuan Cui <decui@microsoft.com>
|
|
Date: Mon, 21 Mar 2016 02:51:09 -0700
|
|
Subject: [PATCH 37/44] net: add the AF_KCM entries to family name tables
|
|
|
|
This is for the recent kcm driver, which introduces AF_KCM(41) in
|
|
b7ac4eb(kcm: Kernel Connection Multiplexor module).
|
|
|
|
Signed-off-by: Dexuan Cui <decui@microsoft.com>
|
|
Cc: Signed-off-by: Tom Herbert <tom@herbertland.com>
|
|
Origin: https://patchwork.ozlabs.org/patch/600006
|
|
---
|
|
net/core/sock.c | 9 ++++++---
|
|
1 file changed, 6 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/net/core/sock.c b/net/core/sock.c
|
|
index 9c708a5fb751..36afa5d4598b 100644
|
|
--- a/net/core/sock.c
|
|
+++ b/net/core/sock.c
|
|
@@ -263,7 +263,8 @@ static const char *const af_family_key_strings[AF_MAX+1] = {
|
|
"sk_lock-AF_TIPC" , "sk_lock-AF_BLUETOOTH", "sk_lock-IUCV" ,
|
|
"sk_lock-AF_RXRPC" , "sk_lock-AF_ISDN" , "sk_lock-AF_PHONET" ,
|
|
"sk_lock-AF_IEEE802154", "sk_lock-AF_CAIF" , "sk_lock-AF_ALG" ,
|
|
- "sk_lock-AF_NFC" , "sk_lock-AF_VSOCK" , "sk_lock-AF_MAX"
|
|
+ "sk_lock-AF_NFC" , "sk_lock-AF_VSOCK" , "sk_lock-AF_KCM" ,
|
|
+ "sk_lock-AF_MAX"
|
|
};
|
|
static const char *const af_family_slock_key_strings[AF_MAX+1] = {
|
|
"slock-AF_UNSPEC", "slock-AF_UNIX" , "slock-AF_INET" ,
|
|
@@ -279,7 +280,8 @@ static const char *const af_family_slock_key_strings[AF_MAX+1] = {
|
|
"slock-AF_TIPC" , "slock-AF_BLUETOOTH", "slock-AF_IUCV" ,
|
|
"slock-AF_RXRPC" , "slock-AF_ISDN" , "slock-AF_PHONET" ,
|
|
"slock-AF_IEEE802154", "slock-AF_CAIF" , "slock-AF_ALG" ,
|
|
- "slock-AF_NFC" , "slock-AF_VSOCK" ,"slock-AF_MAX"
|
|
+ "slock-AF_NFC" , "slock-AF_VSOCK" ,"slock-AF_KCM" ,
|
|
+ "slock-AF_MAX"
|
|
};
|
|
static const char *const af_family_clock_key_strings[AF_MAX+1] = {
|
|
"clock-AF_UNSPEC", "clock-AF_UNIX" , "clock-AF_INET" ,
|
|
@@ -295,7 +297,8 @@ static const char *const af_family_clock_key_strings[AF_MAX+1] = {
|
|
"clock-AF_TIPC" , "clock-AF_BLUETOOTH", "clock-AF_IUCV" ,
|
|
"clock-AF_RXRPC" , "clock-AF_ISDN" , "clock-AF_PHONET" ,
|
|
"clock-AF_IEEE802154", "clock-AF_CAIF" , "clock-AF_ALG" ,
|
|
- "clock-AF_NFC" , "clock-AF_VSOCK" , "clock-AF_MAX"
|
|
+ "clock-AF_NFC" , "clock-AF_VSOCK" , "clock-AF_KCM" ,
|
|
+ "clock-AF_MAX"
|
|
};
|
|
|
|
/*
|
|
--
|
|
2.11.0
|
|
|