net: usb: cdc_ncm: reject negative chained NDP offsets
Subsystems (5)
Greg Kroah-Hartman
maintainerPATCH 1/1 net: usb: cdc_ncm: reject negative chained NDP offsets
cdc_ncm_rx_fixup() reads dwNextNdpIndex from each NDP32 to chain to the next one. The 32-bit value from the device is stored into the signed int ndpoffset so that means values with the high bit set become negative. The first time this is read, the value is properly tested for a negative value BUT the next time through the loop, this type of check is missed entirely.
Fix this up by checking for a negative value when dwNextNdpIndex is read again in the bottom of the loop to match the top check.
Commit 8d2b1a1ec9f5 ("CDC-NCM: avoid overflow in sanity checking") fixed a similar signed-overflow issue in the datagram offset checks of the same function.
--- drivers/net/usb/cdc_ncm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/usb/cdc_ncm.c +1 -1
@@ -1835,7 +1835,7 @@ int cdc_ncm_rx_fixup(struct usbnet *dev, struct sk_buff *skb_in)else ndpoffset =le32_to_cpu (ndp.ndp32->dwNextNdpIndex); -if (ndpoffset && loopcount--) +if (ndpoffset >0 && loopcount--) goto next_ndp;/* update stats */
Signature · 1 line
2.53.0
Quoted 3 lines · Greg Kroah-Hartman
cdc_ncm_rx_fixup()reads dwNextNdpIndex from each NDP32 to chain to the next one. The 32-bit value from the device is stored into the signed int ndpoffset so that means values with the high bit set become
Well, then isn't the problem rather that you should not store an unsigned value in a signed variable?
Regards
Oliver
Greg Kroah-Hartman
maintainerQuoted 9 lines · Oliver Neukum
Quoted 3 lines · Greg Kroah-Hartman
cdc_ncm_rx_fixup()reads dwNextNdpIndex from each NDP32 to chain to the next one. The 32-bit value from the device is stored into the signed int ndpoffset so that means values with the high bit set becomeWell, then isn't the problem rather that you should not store an unsigned value in a signed variable?
No. well, yes. but no.
cdc_ncm_rx_verify_nth16() returns an int, and is negative if something went wrong, so we need it that way, and then we need to check it, like we properly do at the top of the loop, it's just that at the bottom of the loop we also need to do the same exact thing.
So I really think this patch is the correct thing to do unless you want to add another temp variable here just for the sign -> unsigned transition and but that might be even messier.
thanks,
greg k-h
Quoted 11 lines · Greg Kroah-Hartman
Quoted 9 lines · Oliver Neukum
Quoted 3 lines · Greg Kroah-Hartman
cdc_ncm_rx_fixup()reads dwNextNdpIndex from each NDP32 to chain to the next one. The 32-bit value from the device is stored into the signed int ndpoffset so that means values with the high bit set becomeWell, then isn't the problem rather that you should not store an unsigned value in a signed variable?
Quoted 6 lines
No. well, yes. but no.
cdc_ncm_rx_verify_nth16()returns an int, and is negative if something went wrong, so we need it that way, and then we need to check it, like we properly do at the top of the loop, it's just that at the bottom of the loop we also need to do the same exact thing.
Doesn't that suggest that cdc_ncm_rx_verify_nth16() is the problem? To be precise, the way it indicates errors?
As this is an offset into a buffer and the header must be at the start of the buffer, isn't 0 the natural indication of an error?
Regards
Oliver
Greg Kroah-Hartman
maintainerQuoted 19 lines · Oliver Neukum
Quoted 11 lines · Greg Kroah-Hartman
Quoted 9 lines · Oliver Neukum
Quoted 3 lines · Greg Kroah-Hartman
cdc_ncm_rx_fixup()reads dwNextNdpIndex from each NDP32 to chain to the next one. The 32-bit value from the device is stored into the signed int ndpoffset so that means values with the high bit set becomeWell, then isn't the problem rather that you should not store an unsigned value in a signed variable?
Quoted 6 lines
No. well, yes. but no.
cdc_ncm_rx_verify_nth16()returns an int, and is negative if something went wrong, so we need it that way, and then we need to check it, like we properly do at the top of the loop, it's just that at the bottom of the loop we also need to do the same exact thing.
Quoted 4 lines
Doesn't that suggest that
cdc_ncm_rx_verify_nth16()is the problem? To be precise, the way it indicates errors?
As this is an offset into a buffer and the header must be at the start of the buffer, isn't 0 the natural indication of an error?
Maybe? I really don't know, sorry, parsing the cdc_ncm buffer is not something I looked too deeply into :)
greg k-h
Quoted 20 lines · Greg Kroah-Hartman
Quoted 19 lines · Oliver Neukum
Quoted 17 lines · Greg Kroah-Hartman
Quoted 9 lines · Oliver Neukum
Quoted 3 lines · Greg Kroah-Hartman
cdc_ncm_rx_fixup()reads dwNextNdpIndex from each NDP32 to chain to the next one. The 32-bit value from the device is stored into the signed int ndpoffset so that means values with the high bit set becomeWell, then isn't the problem rather that you should not store an unsigned value in a signed variable?
No. well, yes. but no.
cdc_ncm_rx_verify_nth16()returns an int, and is negative if something went wrong, so we need it that way, and then we need to check it, like we properly do at the top of the loop, it's just that at the bottom of the loop we also need to do the same exact thing.
Quoted 7 lines
Quoted 4 lines
Doesn't that suggest that
cdc_ncm_rx_verify_nth16()is the problem? To be precise, the way it indicates errors?
As this is an offset into a buffer and the header must be at the start of the buffer, isn't 0 the natural indication of an error?Maybe? I really don't know, sorry, parsing the
cdc_ncmbuffer is not something I looked too deeply into :)
Oliver is correct AFAICS. These functions could use 0 to indicate errors. This would make the code simpler and cleaner.
The negative error return is just a sloppy choice I made at a time we only supported the 16bit versions. Didn't anticipate 32bit support since it is optional and pointless. But as usual, hardware vendors do surprising things.
Note that cdc_mbim.c must be updated if cdc_ncm_rx_verify_nth16() is changed.
Bjørn
Greg Kroah-Hartman
maintainerQuoted 32 lines · Bjørn Mork
Quoted 20 lines · Greg Kroah-Hartman
Quoted 19 lines · Oliver Neukum
Quoted 17 lines · Greg Kroah-Hartman
Quoted 9 lines · Oliver Neukum
Quoted 3 lines · Greg Kroah-Hartman
cdc_ncm_rx_fixup()reads dwNextNdpIndex from each NDP32 to chain to the next one. The 32-bit value from the device is stored into the signed int ndpoffset so that means values with the high bit set becomeWell, then isn't the problem rather that you should not store an unsigned value in a signed variable?
No. well, yes. but no.
cdc_ncm_rx_verify_nth16()returns an int, and is negative if something went wrong, so we need it that way, and then we need to check it, like we properly do at the top of the loop, it's just that at the bottom of the loop we also need to do the same exact thing.Quoted 7 lines
Quoted 4 lines
Doesn't that suggest that
cdc_ncm_rx_verify_nth16()is the problem? To be precise, the way it indicates errors?
As this is an offset into a buffer and the header must be at the start of the buffer, isn't 0 the natural indication of an error?Maybe? I really don't know, sorry, parsing the
cdc_ncmbuffer is not something I looked too deeply into :)Oliver is correct AFAICS. These functions could use 0 to indicate errors. This would make the code simpler and cleaner.
Quoted 7 lines
The negative error return is just a sloppy choice I made at a time we only supported the 16bit versions. Didn't anticipate 32bit support since it is optional and pointless. But as usual, hardware vendors do surprising things.
Note that
cdc_mbim.cmust be updated ifcdc_ncm_rx_verify_nth16()is changed.
Ok thanks for the background, I'll rework this after the merge window is over.
greg k-h