Message ID | 20250105010121.12546-7-forst@pen.gy (mailing list archive) |
---|---|
State | New |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | usbnet: ipheth: prevent OoB reads of NDP16 | expand |
On Sun, Jan 05, 2025 at 02:01:20AM +0100, Foster Snowhill wrote: > Fix an out-of-bounds DPE read, limit the number of processed DPEs to > the amount that fits into the fixed-size NDP16 header. > > Fixes: a2d274c62e44 ("usbnet: ipheth: add CDC NCM support") > Signed-off-by: Foster Snowhill <forst@pen.gy> > --- > v4: > Split from "usbnet: ipheth: refactor NCM datagram loop, fix DPE OoB > read" in v3. This commit is responsible for addressing the potential > OoB read. > v3: https://lore.kernel.org/netdev/20241123235432.821220-5-forst@pen.gy/ > Split out from a monolithic patch in v2 as an atomic change. > v2: https://lore.kernel.org/netdev/20240912211817.1707844-1-forst@pen.gy/ > No code changes. Update commit message to further clarify that > `ipheth` is not and does not aim to be a complete or spec-compliant > CDC NCM implementation. > v1: https://lore.kernel.org/netdev/20240907230108.978355-1-forst@pen.gy/ > --- > drivers/net/usb/ipheth.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) Hi, This is the friendly patch-bot of Greg Kroah-Hartman. You have sent him a patch that has triggered this response. He used to manually respond to these common problems, but in order to save his sanity (he kept writing the same thing over and over, yet to different people), I was created. Hopefully you will not take offence and will fix the problem in your patch and resubmit it so that it can be accepted into the Linux kernel tree. You are receiving this message because of the following common error(s) as indicated below: - You have marked a patch with a "Fixes:" tag for a commit that is in an older released kernel, yet you do not have a cc: stable line in the signed-off-by area at all, which means that the patch will not be applied to any older kernel releases. To properly fix this, please follow the documented rules in the Documentation/process/stable-kernel-rules.rst file for how to resolve this. If you wish to discuss this problem further, or you have questions about how to resolve this issue, please feel free to respond to this email and Greg will reply once he has dug out from the pending patches received from other developers. thanks, greg k-h's patch email bot
diff --git a/drivers/net/usb/ipheth.c b/drivers/net/usb/ipheth.c index 03249208612e..5347cd7e295b 100644 --- a/drivers/net/usb/ipheth.c +++ b/drivers/net/usb/ipheth.c @@ -246,7 +246,7 @@ static int ipheth_rcvbulk_callback_ncm(struct urb *urb) goto rx_error; dpe = ncm0->dpe16; - while (true) { + for (int dpe_i = 0; dpe_i < IPHETH_NDP16_MAX_DPE; ++dpe_i, ++dpe) { dg_idx = le16_to_cpu(dpe->wDatagramIndex); dg_len = le16_to_cpu(dpe->wDatagramLength); @@ -268,8 +268,6 @@ static int ipheth_rcvbulk_callback_ncm(struct urb *urb) retval = ipheth_consume_skb(buf, dg_len, dev); if (retval != 0) return retval; - - dpe++; } rx_error:
Fix an out-of-bounds DPE read, limit the number of processed DPEs to the amount that fits into the fixed-size NDP16 header. Fixes: a2d274c62e44 ("usbnet: ipheth: add CDC NCM support") Signed-off-by: Foster Snowhill <forst@pen.gy> --- v4: Split from "usbnet: ipheth: refactor NCM datagram loop, fix DPE OoB read" in v3. This commit is responsible for addressing the potential OoB read. v3: https://lore.kernel.org/netdev/20241123235432.821220-5-forst@pen.gy/ Split out from a monolithic patch in v2 as an atomic change. v2: https://lore.kernel.org/netdev/20240912211817.1707844-1-forst@pen.gy/ No code changes. Update commit message to further clarify that `ipheth` is not and does not aim to be a complete or spec-compliant CDC NCM implementation. v1: https://lore.kernel.org/netdev/20240907230108.978355-1-forst@pen.gy/ --- drivers/net/usb/ipheth.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)