From: Greg Kroah-Hartman Date: Thu, 13 Jun 2019 07:40:53 +0000 (+0200) Subject: 4.14-stable patches X-Git-Tag: v5.1.10~13 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b2518eb3670e3db2555467979c343aacb6d912a2;p=thirdparty%2Fkernel%2Fstable-queue.git 4.14-stable patches added patches: revert-bluetooth-align-minimum-encryption-key-size-for-le-and-br-edr-connections.patch revert-drm-nouveau-add-kconfig-option-to-turn-off-nouveau-legacy-contexts.-v3.patch --- diff --git a/queue-4.14/fuse-retrieve-cap-requested-size-to-negotiated-max_w.patch b/queue-4.14/fuse-retrieve-cap-requested-size-to-negotiated-max_w.patch index 78c3705c1fb..6844803d37c 100644 --- a/queue-4.14/fuse-retrieve-cap-requested-size-to-negotiated-max_w.patch +++ b/queue-4.14/fuse-retrieve-cap-requested-size-to-negotiated-max_w.patch @@ -45,14 +45,12 @@ Cc: Jakob Unterwurzacher Signed-off-by: Miklos Szeredi Signed-off-by: Sasha Levin --- - fs/fuse/dev.c | 2 +- + fs/fuse/dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c -index 4c78b90bc83e..6dbc915520da 100644 --- a/fs/fuse/dev.c +++ b/fs/fuse/dev.c -@@ -1688,7 +1688,7 @@ static int fuse_retrieve(struct fuse_conn *fc, struct inode *inode, +@@ -1678,7 +1678,7 @@ static int fuse_retrieve(struct fuse_con offset = outarg->offset & ~PAGE_MASK; file_size = i_size_read(inode); @@ -61,6 +59,3 @@ index 4c78b90bc83e..6dbc915520da 100644 if (outarg->offset > file_size) num = 0; else if (outarg->offset + num > file_size) --- -2.20.1 - diff --git a/queue-4.14/revert-bluetooth-align-minimum-encryption-key-size-for-le-and-br-edr-connections.patch b/queue-4.14/revert-bluetooth-align-minimum-encryption-key-size-for-le-and-br-edr-connections.patch new file mode 100644 index 00000000000..12f2f43fc4d --- /dev/null +++ b/queue-4.14/revert-bluetooth-align-minimum-encryption-key-size-for-le-and-br-edr-connections.patch @@ -0,0 +1,55 @@ +From cf24ec6fe7cbd3bd0722cb9e7d845b4b818f2275 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman +Date: Thu, 13 Jun 2019 09:28:42 +0200 +Subject: Revert "Bluetooth: Align minimum encryption key size for LE and BR/EDR connections" + +From: Greg Kroah-Hartman + +This reverts commit 2fa7a155b25160696cd77cdd995536cf5e172e20 which is +commit d5bb334a8e171b262e48f378bd2096c0ea458265 upstream. + +Lots of people have reported issues with this patch, and as there does +not seem to be a fix going into Linus's kernel tree any time soon, +revert the commit in the stable trees so as to get people's machines +working properly again. + +Reported-by: Vasily Khoruzhick +Reported-by: Hans de Goede +Cc: Jeremy Cline +Cc: Marcel Holtmann +Cc: Johan Hedberg +Signed-off-by: Greg Kroah-Hartman +--- + include/net/bluetooth/hci_core.h | 3 --- + net/bluetooth/hci_conn.c | 8 -------- + 2 files changed, 11 deletions(-) + +--- a/include/net/bluetooth/hci_core.h ++++ b/include/net/bluetooth/hci_core.h +@@ -178,9 +178,6 @@ struct adv_info { + + #define HCI_MAX_SHORT_NAME_LENGTH 10 + +-/* Min encryption key size to match with SMP */ +-#define HCI_MIN_ENC_KEY_SIZE 7 +- + /* Default LE RPA expiry time, 15 minutes */ + #define HCI_DEFAULT_RPA_TIMEOUT (15 * 60) + +--- a/net/bluetooth/hci_conn.c ++++ b/net/bluetooth/hci_conn.c +@@ -1165,14 +1165,6 @@ int hci_conn_check_link_mode(struct hci_ + !test_bit(HCI_CONN_ENCRYPT, &conn->flags)) + return 0; + +- /* The minimum encryption key size needs to be enforced by the +- * host stack before establishing any L2CAP connections. The +- * specification in theory allows a minimum of 1, but to align +- * BR/EDR and LE transports, a minimum of 7 is chosen. +- */ +- if (conn->enc_key_size < HCI_MIN_ENC_KEY_SIZE) +- return 0; +- + return 1; + } + diff --git a/queue-4.14/revert-drm-nouveau-add-kconfig-option-to-turn-off-nouveau-legacy-contexts.-v3.patch b/queue-4.14/revert-drm-nouveau-add-kconfig-option-to-turn-off-nouveau-legacy-contexts.-v3.patch new file mode 100644 index 00000000000..ee68e88a461 --- /dev/null +++ b/queue-4.14/revert-drm-nouveau-add-kconfig-option-to-turn-off-nouveau-legacy-contexts.-v3.patch @@ -0,0 +1,82 @@ +From 9523323691326f54ef3e4f47606775fd4b00da61 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman +Date: Thu, 13 Jun 2019 09:36:32 +0200 +Subject: Revert "drm/nouveau: add kconfig option to turn off nouveau legacy contexts. (v3)" + +From: Greg Kroah-Hartman + +This reverts commit 140ae656e3b7476719a2b15b96527c73c5acf90b which is +commit b30a43ac7132cdda833ac4b13dd1ebd35ace14b7 upstream. + +Sven reports: + Commit 1e07d63749 ("drm/nouveau: add kconfig option to turn off nouveau + legacy contexts. (v3)") has caused a build failure for me when I + actually tried that option (CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT=n): + + ,---- + | Kernel: arch/x86/boot/bzImage is ready (#1) + | Building modules, stage 2. + | MODPOST 290 modules + | ERROR: "drm_legacy_mmap" [drivers/gpu/drm/nouveau/nouveau.ko] undefined! + | scripts/Makefile.modpost:91: recipe for target '__modpost' failed + `---- + + Upstream does not have that problem, as commit bed2dd8421 ("drm/ttm: + Quick-test mmap offset in ttm_bo_mmap()") has removed the use of + drm_legacy_mmap from nouveau_ttm.c. Unfortunately that commit does not + apply in 5.1.9. + +The ensuing discussion proposed a number of one-off patches, but no +solid agreement was made, so just revert the commit for now to get +people's systems building again. + +Reported-by: Sven Joachim +Cc: Daniel Vetter +Cc: Dave Airlie +Cc: Thomas Backlund +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/nouveau/Kconfig | 13 +------------ + drivers/gpu/drm/nouveau/nouveau_drm.c | 7 ++----- + 2 files changed, 3 insertions(+), 17 deletions(-) + +--- a/drivers/gpu/drm/nouveau/Kconfig ++++ b/drivers/gpu/drm/nouveau/Kconfig +@@ -16,20 +16,9 @@ config DRM_NOUVEAU + select INPUT if ACPI && X86 + select THERMAL if ACPI && X86 + select ACPI_VIDEO if ACPI && X86 +- help +- Choose this option for open-source NVIDIA support. +- +-config NOUVEAU_LEGACY_CTX_SUPPORT +- bool "Nouveau legacy context support" +- depends on DRM_NOUVEAU + select DRM_VM +- default y + help +- There was a version of the nouveau DDX that relied on legacy +- ctx ioctls not erroring out. But that was back in time a long +- ways, so offer a way to disable it now. For uapi compat with +- old nouveau ddx this should be on by default, but modern distros +- should consider turning it off. ++ Choose this option for open-source NVIDIA support. + + config NOUVEAU_PLATFORM_DRIVER + bool "Nouveau (NVIDIA) SoC GPUs" +--- a/drivers/gpu/drm/nouveau/nouveau_drm.c ++++ b/drivers/gpu/drm/nouveau/nouveau_drm.c +@@ -967,11 +967,8 @@ nouveau_driver_fops = { + static struct drm_driver + driver_stub = { + .driver_features = +- DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | DRIVER_RENDER +-#if defined(CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT) +- | DRIVER_KMS_LEGACY_CONTEXT +-#endif +- , ++ DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | DRIVER_RENDER | ++ DRIVER_KMS_LEGACY_CONTEXT, + + .load = nouveau_drm_load, + .unload = nouveau_drm_unload, diff --git a/queue-4.14/series b/queue-4.14/series index ad6f1b8bad5..6b62443821c 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -76,3 +76,5 @@ arm-exynos-fix-undefined-instruction-during-exynos54.patch usb-typec-fusb302-check-vconn-is-off-when-we-start-t.patch gpio-vf610-do-not-share-irq_chip.patch percpu-do-not-search-past-bitmap-when-allocating-an-.patch +revert-bluetooth-align-minimum-encryption-key-size-for-le-and-br-edr-connections.patch +revert-drm-nouveau-add-kconfig-option-to-turn-off-nouveau-legacy-contexts.-v3.patch