On Wed, Nov 23, 2022 at 4:46 AM Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> wrote: > > The Microsoft RNDIS protocol is, as designed, insecure and vulnerable on > any system that uses it with untrusted hosts or devices. Because the > protocol is impossible to make secure, just disable all rndis drivers to > prevent anyone from using them again. > > Windows only needed this for XP and newer systems, Windows systems older > than that can use the normal USB class protocols instead, which do not > have these problems. > > Android has had this disabled for many years so there should not be any > real systems that still need this. > > Cc: "David S. Miller" <davem@xxxxxxxxxxxxx> > Cc: Eric Dumazet <edumazet@xxxxxxxxxx> > Cc: Jakub Kicinski <kuba@xxxxxxxxxx> > Cc: Paolo Abeni <pabeni@xxxxxxxxxx> > Cc: Kalle Valo <kvalo@xxxxxxxxxx> > Cc: Oleksij Rempel <linux@xxxxxxxxxxxxxxxx> > Cc: "Maciej Żenczykowski" <maze@xxxxxxxxxx> > Cc: Neil Armstrong <neil.armstrong@xxxxxxxxxx> > Cc: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx> > Cc: Andrzej Pietrasiewicz <andrzejtp2010@xxxxxxxxx> > Cc: Jacopo Mondi <jacopo@xxxxxxxxxx> > Cc: "Łukasz Stelmach" <l.stelmach@xxxxxxxxxxx> > Cc: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx> > Cc: linux-usb@xxxxxxxxxxxxxxx > Cc: netdev@xxxxxxxxxxxxxxx > Cc: linux-kernel@xxxxxxxxxxxxxxx > Cc: linux-wireless@xxxxxxxxxxxxxxx > Reported-by: Ilja Van Sprundel <ivansprundel@xxxxxxxxxxxx> > Reported-by: Joseph Tartaro <joseph.tartaro@xxxxxxxxxxxx> > Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> > --- > Note, I'll submit patches removing the individual drivers for later, but > that is more complex as unwinding the interaction between the CDC > networking and RNDIS drivers is tricky. For now, let's just disable all > of this code as it is not secure. > > I can take this through the USB tree if the networking maintainers have > no objection. I thought I had done this months ago, when the last round > of "there are bugs in the protocol!" reports happened at the end of > 2021, but forgot to do so, my fault. > > drivers/net/usb/Kconfig | 1 + > drivers/net/wireless/Kconfig | 1 + > drivers/usb/gadget/Kconfig | 4 +--- > drivers/usb/gadget/legacy/Kconfig | 3 +++ > 4 files changed, 6 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/usb/Kconfig b/drivers/net/usb/Kconfig > index 4402eedb3d1a..83f9c0632642 100644 > --- a/drivers/net/usb/Kconfig > +++ b/drivers/net/usb/Kconfig > @@ -401,6 +401,7 @@ config USB_NET_MCS7830 > config USB_NET_RNDIS_HOST > tristate "Host for RNDIS and ActiveSync devices" > depends on USB_USBNET > + depends on BROKEN > select USB_NET_CDCETHER > help > This option enables hosting "Remote NDIS" USB networking links, NACK. I'm perfectly okay with disabling the gadget (guest/client/device) side rndis drivers. New devices (ie. phones) moving to newer kernels should simply be switching to the NCM gadget drivers. Especially since AFAICT this won't land until 6.2 and thus will presumably not be in the 6.1 LTS and thus won't even end up in next year's Android 14/U, and instead will only be present on the absolutely freshest Android 15/V devices launching near the end of 2024 (or really in early 2025). Additionally the gadget side upstream RNDIS implementation simply isn't used by some chipset vendors - like Qualcomm (which AFAIK uses an out of tree driver to provide rndis gadget with IPA hardware offload acceleration). However, AFAICT this patch is also disabling *HOST* side RNDIS driver support. ie. the RNDIS driver you'd use on a Linux laptop to usb tether off of an Android phone. AFAICT this will break usb tethering off of the *vast* majority of Android phones - likely including most of those currently being manufactured and sold. The only Android phones I'm actually aware of that have switched to NCM instead of RNDIS for usb tethering are Google Pixel 6+ (ie. 6/6pro/6a/7/7pro). Though it's possible there might be some relatively new hardware from other phone vendors that also uses NCM - I don't track this that closely... I do know Android 13/T doesn't require phones to use NCM for tethering, and I've not heard of any plans to change that with Android 14/U either... Note that NCM isn't natively supported by Windows <10 and it required a fair bit of 'guts' on our side to drop support for usb tethering Windows 8.1 devices prior to Win 8.1 EOL (which is only this coming January). Yes, AFAICT, this patch as currently written will break usb tethering off of a Google Pixel ../3/4/5, and I'd assume any and all qualcomm chipset derived devices, etc... ie. most likely the first of these two and possibly the second are required: CONFIG_USB_NET_RNDIS_HOST=m CONFIG_USB_NET_RNDIS_WLAN=m (AFAIK the rndis host side driver is also used by various cell dongles and portable cell hotspots) [I also don't understand the commit description where it talks about Windows XP - how is XP relevant? AFAIK the issue is with Win<10 not WinXP] > diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig > index cb1c15012dd0..f162b25123d7 100644 > --- a/drivers/net/wireless/Kconfig > +++ b/drivers/net/wireless/Kconfig > @@ -81,6 +81,7 @@ config USB_NET_RNDIS_WLAN > tristate "Wireless RNDIS USB support" > depends on USB > depends on CFG80211 > + depends on BROKEN > select USB_NET_DRIVERS > select USB_USBNET > select USB_NET_CDCETHER > diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig > index 4fa2ddf322b4..2c99d4313064 100644 > --- a/drivers/usb/gadget/Kconfig > +++ b/drivers/usb/gadget/Kconfig > @@ -183,9 +183,6 @@ config USB_F_EEM > config USB_F_SUBSET > tristate > > -config USB_F_RNDIS > - tristate > - > config USB_F_MASS_STORAGE > tristate > > @@ -297,6 +294,7 @@ config USB_CONFIGFS_RNDIS > bool "RNDIS" > depends on USB_CONFIGFS > depends on NET > + depends on BROKEN > select USB_U_ETHER > select USB_F_RNDIS > help > diff --git a/drivers/usb/gadget/legacy/Kconfig b/drivers/usb/gadget/legacy/Kconfig > index 0a7b382fbe27..03d6da63edf7 100644 > --- a/drivers/usb/gadget/legacy/Kconfig > +++ b/drivers/usb/gadget/legacy/Kconfig > @@ -153,6 +153,7 @@ config USB_ETH > config USB_ETH_RNDIS > bool "RNDIS support" > depends on USB_ETH > + depends on BROKEN > select USB_LIBCOMPOSITE > select USB_F_RNDIS > default y > @@ -247,6 +248,7 @@ config USB_FUNCTIONFS_ETH > config USB_FUNCTIONFS_RNDIS > bool "Include configuration with RNDIS (Ethernet)" > depends on USB_FUNCTIONFS && NET > + depends on BROKEN > select USB_U_ETHER > select USB_F_RNDIS > help > @@ -427,6 +429,7 @@ config USB_G_MULTI > config USB_G_MULTI_RNDIS > bool "RNDIS + CDC Serial + Storage configuration" > depends on USB_G_MULTI > + depends on BROKEN > select USB_F_RNDIS > default y > help > -- > 2.38.1 > Maciej Żenczykowski, Kernel Networking Developer @ Google
