Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

usbnet: ipheth: check that DPE points past NCM header

By definition, a DPE points at the start of a network frame/datagram.
Thus it makes no sense for it to point at anything that's part of the
NCM header. It is not a security issue, but merely an indication of
a malformed DPE.

Enforce that all DPEs point at the data portion of the URB, past the
NCM header.

Fixes: a2d274c62e44 ("usbnet: ipheth: add CDC NCM support")
Cc: stable@vger.kernel.org
Signed-off-by: Foster Snowhill <forst@pen.gy>
Reviewed-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

authored by

Foster Snowhill and committed by
Paolo Abeni
429fa68b c219427e

+2 -1
+2 -1
drivers/net/usb/ipheth.c
··· 242 242 dpe = ncm0->dpe16; 243 243 while (le16_to_cpu(dpe->wDatagramIndex) != 0 && 244 244 le16_to_cpu(dpe->wDatagramLength) != 0) { 245 - if (le16_to_cpu(dpe->wDatagramIndex) >= urb->actual_length || 245 + if (le16_to_cpu(dpe->wDatagramIndex) < IPHETH_NCM_HEADER_SIZE || 246 + le16_to_cpu(dpe->wDatagramIndex) >= urb->actual_length || 246 247 le16_to_cpu(dpe->wDatagramLength) > urb->actual_length - 247 248 le16_to_cpu(dpe->wDatagramIndex)) { 248 249 dev->net->stats.rx_length_errors++;