From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: "Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
stable@vger.kernel.org, "Dan Williams" <dcbw@redhat.com>,
"Bjørn Mork" <bjorn@mork.no>,
"David S. Miller" <davem@davemloft.net>
Subject: [ 22/50] net: qmi_wwan: fixup missing ethernet header (firmware bug workaround)
Date: Fri, 17 May 2013 14:46:57 -0700 [thread overview]
Message-ID: <20130517213845.005294684@linuxfoundation.org> (raw)
In-Reply-To: <20130517213842.447809965@linuxfoundation.org>
3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bjørn Mork <bjorn@mork.no>
[ Upstream commit 6ff509af3869ccac69dcf8905fc75b9a76951594 ]
A number of LTE devices from different vendors all suffer from the
same firmware bug: Most of the packets received from the device while
it is attached to a LTE network will not have an ethernet header. The
devices work as expected when attached to 2G or 3G networks, sending
an ethernet header with all packets.
This driver is not aware of which network the modem attached to, and
even if it were there are still some packet types which are always
received with the header intact.
All devices supported by this driver have severely limited
networking capabilities:
- can only transmit IPv4, IPv6 and possibly ARP
- can only support a single host hardware address at any time
- will only do point-to-point communcation with the host
Because of this, we are able to reliably identify any bogus raw IP
packets by simply looking at the 4 IP version bits. All we need to
do is to avoid 4 or 6 in the first digit of the mac address. This
workaround ensures this, and fix up the received packets as necessary.
Given the distribution of the bug, it is believed that the source is
the chipset vendor. The devices which are verified to be affected are:
Huawei E392u-12 (Qualcomm MDM9200)
Pantech UML290 (Qualcomm MDM9600)
Novatel USB551L (Qualcomm MDM9600)
Novatel E362 (Qualcomm MDM9600)
It is believed that the bug depend on firmware revision, which means
that possibly all devices based on the above mentioned chipset may be
affected if we consider all available firmware revisions.
The information about affected devices and versions is likely
incomplete. As the additional overhead for packets not needing this
fixup is very small, it is considered acceptable to apply the
workaround to all devices handled by this driver.
Reported-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: Bjørn Mork <bjorn@mork.no>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/net/usb/qmi_wwan.c | 81 +++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 81 insertions(+)
--- a/drivers/net/usb/qmi_wwan.c
+++ b/drivers/net/usb/qmi_wwan.c
@@ -9,6 +9,7 @@
#include <linux/module.h>
#include <linux/netdevice.h>
#include <linux/ethtool.h>
+#include <linux/etherdevice.h>
#include <linux/mii.h>
#include <linux/usb.h>
#include <linux/usb/cdc.h>
@@ -174,6 +175,79 @@ err:
return status;
}
+/* Make up an ethernet header if the packet doesn't have one.
+ *
+ * A firmware bug common among several devices cause them to send raw
+ * IP packets under some circumstances. There is no way for the
+ * driver/host to know when this will happen. And even when the bug
+ * hits, some packets will still arrive with an intact header.
+ *
+ * The supported devices are only capably of sending IPv4, IPv6 and
+ * ARP packets on a point-to-point link. Any packet with an ethernet
+ * header will have either our address or a broadcast/multicast
+ * address as destination. ARP packets will always have a header.
+ *
+ * This means that this function will reliably add the appropriate
+ * header iff necessary, provided our hardware address does not start
+ * with 4 or 6.
+ */
+static int qmi_wwan_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
+{
+ __be16 proto;
+
+ /* usbnet rx_complete guarantees that skb->len is at least
+ * hard_header_len, so we can inspect the dest address without
+ * checking skb->len
+ */
+ switch (skb->data[0] & 0xf0) {
+ case 0x40:
+ proto = htons(ETH_P_IP);
+ break;
+ case 0x60:
+ proto = htons(ETH_P_IPV6);
+ break;
+ default:
+ /* pass along other packets without modifications */
+ return 1;
+ }
+ if (skb_headroom(skb) < ETH_HLEN)
+ return 0;
+ skb_push(skb, ETH_HLEN);
+ skb_reset_mac_header(skb);
+ eth_hdr(skb)->h_proto = proto;
+ memset(eth_hdr(skb)->h_source, 0, ETH_ALEN);
+ memcpy(eth_hdr(skb)->h_dest, dev->net->dev_addr, ETH_ALEN);
+ return 1;
+}
+
+/* very simplistic detection of IPv4 or IPv6 headers */
+static bool possibly_iphdr(const char *data)
+{
+ return (data[0] & 0xd0) == 0x40;
+}
+
+/* disallow addresses which may be confused with IP headers */
+static int qmi_wwan_mac_addr(struct net_device *dev, void *p)
+{
+ struct sockaddr *addr = p;
+
+ if (!is_valid_ether_addr(addr->sa_data) ||
+ possibly_iphdr(addr->sa_data))
+ return -EADDRNOTAVAIL;
+ memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN);
+ return 0;
+}
+
+static const struct net_device_ops qmi_wwan_netdev_ops = {
+ .ndo_open = usbnet_open,
+ .ndo_stop = usbnet_stop,
+ .ndo_start_xmit = usbnet_start_xmit,
+ .ndo_tx_timeout = usbnet_tx_timeout,
+ .ndo_change_mtu = usbnet_change_mtu,
+ .ndo_set_mac_address = qmi_wwan_mac_addr,
+ .ndo_validate_addr = eth_validate_addr,
+};
+
/* using a counter to merge subdriver requests with our own into a combined state */
static int qmi_wwan_manage_power(struct usbnet *dev, int on)
{
@@ -257,6 +331,12 @@ static int qmi_wwan_bind_shared(struct u
/* save subdriver struct for suspend/resume wrappers */
dev->data[0] = (unsigned long)subdriver;
+ /* make MAC addr easily distinguishable from an IP header */
+ if (possibly_iphdr(dev->net->dev_addr)) {
+ dev->net->dev_addr[0] |= 0x02; /* set local assignment bit */
+ dev->net->dev_addr[0] &= 0xbf; /* clear "IP" bit */
+ }
+ dev->net->netdev_ops = &qmi_wwan_netdev_ops;
err:
return rv;
}
@@ -326,6 +406,7 @@ static const struct driver_info qmi_wwan
.bind = qmi_wwan_bind_shared,
.unbind = qmi_wwan_unbind_shared,
.manage_power = qmi_wwan_manage_power,
+ .rx_fixup = qmi_wwan_rx_fixup,
};
static const struct driver_info qmi_wwan_force_int0 = {
next prev parent reply other threads:[~2013-05-17 22:02 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-17 21:46 [ 00/50] 3.4.46-stable review Greg Kroah-Hartman
2013-05-17 21:46 ` [ 01/50] KVM: VMX: fix halt emulation while emulating invalid guest sate Greg Kroah-Hartman
2013-05-17 21:46 ` [ 02/50] ARM: OMAP: RX-51: change probe order of touchscreen and panel SPI devices Greg Kroah-Hartman
2013-05-17 21:46 ` [ 03/50] ASoC: wm8994: missing break in wm8994_aif3_hw_params() Greg Kroah-Hartman
2013-05-17 21:46 ` [ 04/50] ACPICA: Fix possible buffer overflow during a field unit read operation Greg Kroah-Hartman
2013-05-17 21:46 ` [ 05/50] ALSA: HDA: Fix Oops caused by dereference NULL pointer Greg Kroah-Hartman
2013-05-17 21:46 ` [ 06/50] dm snapshot: fix error return code in snapshot_ctr Greg Kroah-Hartman
2013-05-17 21:46 ` [ 07/50] nfsd4: dont allow owner override on 4.1 CLAIM_FH opens Greg Kroah-Hartman
2013-05-17 21:46 ` [ 08/50] hp_accel: Ignore the error from lis3lv02d_poweron() at resume Greg Kroah-Hartman
2013-05-17 21:46 ` [ 09/50] xen/vcpu/pvhvm: Fix vcpu hotplugging hanging Greg Kroah-Hartman
2013-05-17 21:46 ` [ 10/50] SCSI: sd: fix array cache flushing bug causing performance problems Greg Kroah-Hartman
2013-05-17 21:46 ` [ 11/50] audit: Syscall rules are not applied to existing processes on non-x86 Greg Kroah-Hartman
2013-05-17 21:46 ` [ 12/50] timer: Dont reinitialize the cpu base lock during CPU_UP_PREPARE Greg Kroah-Hartman
2013-05-17 21:46 ` [ 13/50] tick: Cleanup NOHZ per cpu data on cpu down Greg Kroah-Hartman
2013-05-17 21:46 ` [ 14/50] tracing: Fix leaks of filter preds Greg Kroah-Hartman
2013-05-17 21:46 ` [ 15/50] ext4: limit group search loop for non-extent files Greg Kroah-Hartman
2013-05-17 21:46 ` [ 16/50] powerpc: Bring all threads online prior to migration/hibernation Greg Kroah-Hartman
2013-05-17 21:46 ` [ 17/50] ath9k: fix key allocation error handling for powersave keys Greg Kroah-Hartman
2013-05-17 21:46 ` [ 18/50] mwifiex: clear is_suspended flag when interrupt is received early Greg Kroah-Hartman
2013-05-17 21:46 ` [ 19/50] mwifiex: fix setting of multicast filter Greg Kroah-Hartman
2013-05-17 21:46 ` [ 20/50] B43: Handle DMA RX descriptor underrun Greg Kroah-Hartman
2013-05-17 21:46 ` [ 21/50] drm/mm: fix dump table BUG Greg Kroah-Hartman
2013-05-17 21:46 ` Greg Kroah-Hartman [this message]
2013-05-17 21:46 ` [ 23/50] net: qmi_wwan: fixup destination address (firmware bug workaround) Greg Kroah-Hartman
2013-05-17 21:46 ` [ 24/50] net: qmi_wwan: prevent duplicate mac address on link " Greg Kroah-Hartman
2013-05-17 21:47 ` [ 25/50] tcp: force a dst refcount when prequeue packet Greg Kroah-Hartman
2013-05-17 21:47 ` [ 26/50] sfc: Fix naming of MTD partitions for FPGA bitfiles Greg Kroah-Hartman
2013-05-17 21:47 ` [ 27/50] 3c509.c: call SET_NETDEV_DEV for all device types (ISA/ISAPnP/EISA) Greg Kroah-Hartman
2013-05-17 21:47 ` [ 28/50] net_sched: act_ipt forward compat with xtables Greg Kroah-Hartman
2013-05-17 21:47 ` [ 29/50] net: use netdev_features_t in skb_needs_linearize() Greg Kroah-Hartman
2013-05-17 21:47 ` [ 30/50] net: vlan,ethtool: netdev_features_t is more than 32 bit Greg Kroah-Hartman
2013-05-17 21:47 ` [ 31/50] bridge: fix race with topology change timer Greg Kroah-Hartman
2013-05-17 21:47 ` [ 32/50] packet: tpacket_v3: do not trigger bug() on wrong header status Greg Kroah-Hartman
2013-05-17 21:47 ` [ 33/50] 3c59x: fix freeing nonexistent resource on driver unload Greg Kroah-Hartman
2013-05-17 21:47 ` [ 34/50] 3c59x: fix PCI resource management Greg Kroah-Hartman
2013-05-17 21:47 ` [ 35/50] if_cablemodem.h: Add parenthesis around ioctl macros Greg Kroah-Hartman
2013-05-17 21:47 ` [ 36/50] macvlan: fix passthru mode race between dev removal and rx path Greg Kroah-Hartman
2013-05-17 21:47 ` [ 37/50] ipv6: do not clear pinet6 field Greg Kroah-Hartman
2013-05-17 21:47 ` [ 38/50] xfrm6: release dev before returning error Greg Kroah-Hartman
2013-05-17 21:47 ` [ 39/50] dm thin: do not set discard_zeroes_data Greg Kroah-Hartman
2013-05-17 21:47 ` [ 40/50] pch_dma: Use GFP_ATOMIC because called from interrupt context Greg Kroah-Hartman
2013-05-17 21:47 ` [ 41/50] hugetlbfs: fix mmap failure in unaligned size request Greg Kroah-Hartman
2013-05-17 21:47 ` [ 42/50] r8169: fix vlan tag read ordering Greg Kroah-Hartman
2013-05-17 21:47 ` [ 43/50] drbd: fix for deadlock when using automatic split-brain-recovery Greg Kroah-Hartman
2013-05-17 21:47 ` [ 44/50] drivers/rtc/rtc-pcf2123.c: fix error return code in pcf2123_probe() Greg Kroah-Hartman
2013-05-17 21:47 ` [ 45/50] iscsi-target: Fix processing of OOO commands Greg Kroah-Hartman
2013-05-17 21:47 ` [ 46/50] ACPI / EC: Restart transaction even when the IBF flag set Greg Kroah-Hartman
2013-05-17 21:47 ` [ 47/50] drivers/char/ipmi: memcpy, need additional 2 bytes to avoid memory overflow Greg Kroah-Hartman
2013-05-17 21:47 ` [ 48/50] ipmi: ipmi_devintf: compat_ioctl method fails to take ipmi_mutex Greg Kroah-Hartman
2013-05-17 21:47 ` [ 49/50] drm/radeon: check incoming cliprects pointer Greg Kroah-Hartman
2013-05-17 21:47 ` [ 50/50] usermodehelper: check subprocess_info->path != NULL Greg Kroah-Hartman
2013-05-19 11:16 ` [ 00/50] 3.4.46-stable review Satoru Takeuchi
2013-05-19 18:05 ` Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130517213845.005294684@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=bjorn@mork.no \
--cc=davem@davemloft.net \
--cc=dcbw@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox