From 6e014d00acfa9900c1683318d65c97db4c761f05 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 8 Mar 2022 11:42:43 +0100 Subject: [PATCH] ANDROID: GKI: disable rndis USB gadget driver It's obsolete and only works for unsupported Windows hosts and is totally insecure and should never be used. Remove it in order to remove a potential attack vector on Android systems. NCM is a much better interface to use and it also works on other operating system hosts. Bug: 157965270 Bug: 226303025 Signed-off-by: Greg Kroah-Hartman Change-Id: I45acc8b894220cdc9f170f9d5428aca195e9af38 (cherry picked from commit 0ea619fbd3aa56e764ee12ca680423ff2b7ce386) Signed-off-by: Will McVicker --- arch/arm64/configs/gki_defconfig | 1 - arch/x86/configs/gki_defconfig | 1 - 2 files changed, 2 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index fc275907c665..92a1ecdf0577 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -484,7 +484,6 @@ CONFIG_USB_CONFIGFS_SERIAL=y CONFIG_USB_CONFIGFS_ACM=y CONFIG_USB_CONFIGFS_NCM=y CONFIG_USB_CONFIGFS_ECM=y -CONFIG_USB_CONFIGFS_RNDIS=y CONFIG_USB_CONFIGFS_EEM=y CONFIG_USB_CONFIGFS_MASS_STORAGE=y CONFIG_USB_CONFIGFS_F_FS=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 18263269120c..6780967db039 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -440,7 +440,6 @@ CONFIG_USB_CONFIGFS_SERIAL=y CONFIG_USB_CONFIGFS_ACM=y CONFIG_USB_CONFIGFS_NCM=y CONFIG_USB_CONFIGFS_ECM=y -CONFIG_USB_CONFIGFS_RNDIS=y CONFIG_USB_CONFIGFS_EEM=y CONFIG_USB_CONFIGFS_MASS_STORAGE=y CONFIG_USB_CONFIGFS_F_FS=y