colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

filter: require >1 port in devices with AT-capable ttyACMs

Browse Source 
Instead of blindly allowing to be probed all ttyACM ports that report
them as AT-capable, we will now instead forbid all ttyACM ports that
don't report themselves as AT-capable.

Also, require the modem to expose other additional ports (of any kind
usable by ModemManager) in addition to the AT-capable ttyACM port.

This update should avoid automatically probing Arduino devices that
wrongly report their exposed single ttyACM port as AT-capable.

https://github.com/arduino/ArduinoCore-avr/pull/92
https://gitlab.freedesktop.org/mobile-broadband/ModemManager/issues/140
https://gitlab.freedesktop.org/mobile-broadband/ModemManager/issues/127
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=930264
This commit is contained in:
Aleksander Morgado
2019-09-06 15:51:00 +02:00
committed by Dan Williams
parent 2a8d20292a
commit 0e02771e5c
1 changed files with 44 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/mm-filter.c
View File

@@ -172,7 +172,13 @@ mm_filter_port (MMFilter *self,
} }
/* /*
* If the TTY kernel driver is cdc-acm and the interface is class=2/subclass=2/protocol=[1-6], allow it. * If the TTY kernel driver is cdc-acm and the interface is not
* class=2/subclass=2/protocol=[1-6], forbidden.
*
* Otherwise, we'll require the modem to have more ports other
* than the ttyACM one (see mm_filter_device_and_port()), because
* there are lots of Arduino devices out there exposing a single
* ttyACM port and wrongly claiming AT protocol support...
* *
* Class definitions for Communication Devices 1.2 * Class definitions for Communication Devices 1.2
* Communications Interface Class Control Protocol Codes: * Communications Interface Class Control Protocol Codes:
@@ -190,11 +196,12 @@ mm_filter_port (MMFilter *self,
*/ */
if ((self->priv->enabled_rules & MM_FILTER_RULE_TTY_ACM_INTERFACE) && if ((self->priv->enabled_rules & MM_FILTER_RULE_TTY_ACM_INTERFACE) &&
(!g_strcmp0 (driver, "cdc_acm")) && (!g_strcmp0 (driver, "cdc_acm")) &&
(mm_kernel_device_get_interface_class (port) == 2) && ((mm_kernel_device_get_interface_class (port) != 2) ||
(mm_kernel_device_get_interface_subclass (port) == 2) && (mm_kernel_device_get_interface_subclass (port) != 2) ||
(mm_kernel_device_get_interface_protocol (port) >= 1) && (mm_kernel_device_get_interface_protocol (port) <= 6)) { (mm_kernel_device_get_interface_protocol (port) < 1) ||
mm_dbg ("[filter] (%s/%s): port allowed: cdc-acm interface reported AT-capable", subsystem, name); (mm_kernel_device_get_interface_protocol (port) > 6))) {
return TRUE; mm_dbg ("[filter] (%s/%s): port filtered: cdc-acm interface is not AT-capable", subsystem, name);
return FALSE;
} }
/* Default forbidden? flag the port as maybe-forbidden, and go on */ /* Default forbidden? flag the port as maybe-forbidden, and go on */
@@ -213,6 +220,24 @@ mm_filter_port (MMFilter *self,
/*****************************************************************************/ /*****************************************************************************/
static gboolean
device_has_net_port (MMDevice *device)
{
GList *l;
for (l = mm_device_peek_port_probe_list (device); l; l = g_list_next (l)) {
if (!g_strcmp0 (mm_port_probe_get_port_subsys (MM_PORT_PROBE (l->data)), "net"))
return TRUE;
}
return FALSE;
}
static gboolean
device_has_multiple_ports (MMDevice *device)
{
return (g_list_length (mm_device_peek_port_probe_list (device)) > 1);
}
gboolean gboolean
mm_filter_device_and_port (MMFilter *self, mm_filter_device_and_port (MMFilter *self,
MMDevice *device, MMDevice *device,
@@ -220,6 +245,7 @@ mm_filter_device_and_port (MMFilter *self,
{ {
const gchar *subsystem; const gchar *subsystem;
const gchar *name; const gchar *name;
const gchar *driver;
/* If it wasn't flagged as maybe forbidden, there's nothing to do */ /* If it wasn't flagged as maybe forbidden, there's nothing to do */
if (!GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (port), FILTER_PORT_MAYBE_FORBIDDEN))) if (!GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (port), FILTER_PORT_MAYBE_FORBIDDEN)))
@@ -229,16 +255,19 @@ mm_filter_device_and_port (MMFilter *self,
name = mm_kernel_device_get_name (port); name = mm_kernel_device_get_name (port);
/* Check whether this device holds a NET port in addition to this TTY */ /* Check whether this device holds a NET port in addition to this TTY */
if (self->priv->enabled_rules & MM_FILTER_RULE_TTY_WITH_NET) { if ((self->priv->enabled_rules & MM_FILTER_RULE_TTY_WITH_NET) &&
GList *l; device_has_net_port (device)) {
mm_dbg ("[filter] (%s/%s): port allowed: device also exports a net interface", subsystem, name);
for (l = mm_device_peek_port_probe_list (device); l; l = g_list_next (l)) {
if (!g_strcmp0 (mm_port_probe_get_port_subsys (MM_PORT_PROBE (l->data)), "net")) {
mm_dbg ("[filter] (%s/%s): port allowed: device also exports a net interface (%s)",
subsystem, name, mm_port_probe_get_port_name (MM_PORT_PROBE (l->data)));
return TRUE; return TRUE;
} }
}
/* Check whether this device holds any other port in addition to the ttyACM port */
driver = mm_kernel_device_get_driver (port);
if ((self->priv->enabled_rules & MM_FILTER_RULE_TTY_ACM_INTERFACE) &&
(!g_strcmp0 (driver, "cdc_acm")) &&
device_has_multiple_ports (device)) {
mm_dbg ("[filter] (%s/%s): port allowed: device exports multiple interfaces", subsystem, name);
return TRUE;
} }
mm_dbg ("[filter] (%s/%s) port filtered: forbidden", subsystem, name); mm_dbg ("[filter] (%s/%s) port filtered: forbidden", subsystem, name);